Clean up, new commands in Bodhi style, misc. edits