Cleaned up to match Ali's requirements.  Fixed Colony display.  Misc changes.