notes and minor fixes