- fixed some little bugs