Fixed map loading and rendering.  Added folding to update functions.  Tested with removal.  Need to add removal handlers for components.