fixed some mess-ups