Fixed & Improvements