Fixed & Improvements.