improvements
bug fixes and improvements