Cleanup

Some cleanup of the user interface. Removed remaining setters with Entities.  Some additional documentation work.