notes and fixes