updated entire folder

bug fixes and improvements