v1.1 fixed various bugs