Changed a few mess-ups