Incorporate notes and clean up a bit more