- Fixes and improvements
