bug fixes and improvements
site: minor bug fixes