#297 fix and #244 some inline editing