WIP: more minor edits