added notes and fixed