bug fixes and improvements
site: bug fixes