Fix some issues and add a couple of notes