More bug fixes/changes

Rollback complexity on auto-numbering ascents to keep things simple.

Add Best In Place for reasier editing