merging in a few minor changes, as outlined in changelog