Bug fixes and improvements
Bug fixes