More Fixes & Improvements