Initial edits from my big pass