Cleaned up some code.  Fixed the initial editability setup.