Bug fix
Improvements and bug fixes