- fixed some small bugs