removed some little bugs