small bug fixes
Beta v1.1.2