a few more notes and renames