pre-merge commit

several edits. Merge upcoming.