- a few little fixes