Some fixes and improvements
Cleaning up
Merge branch 'develop'