1.1

fixed bugs