Various notes and fixes