WIP: minor edits