Odds and Ends
merge commits