Fixed up the saving of entities a bit.  The checkboxes are expanded an actually work now