Improvements and fixes
Improvements and fixes