Add more notes and fix minor bugs