notes and little fixes