Improvements and fixes
Bufix