small changes, ready for the bigger edits