Improvements and fixes
Merged