2.1

fixed some little bugs