Fixes & Improvements

Changes