Fix some errors; add some notes