beta3(bug fixes and improvements)