fixed some more little bugs