Fixed more little bugs..