fixed some bugs with normal stuff