Fix & Improvements