a few little fixes