small changes
Fixed some bugs