fix a few comments and edit warning
Add edit mode "builder"

not fully implemented