Fixes & Improvements