Changed a few little bits