General Improvements and fixes