More Changes

Added some more notes of things we need to add.  Made one small change
to avoid an infinite loop