Cleaning up a bit and adding notes.