Some more notes and slight mods