removed old code
implemented edit
fixed initial mapping
fixed edit mode
fixed problem with deferred loading