Add a few extra notes and comments