Organization
Fix a nasty bug and clean up some