Make various changes. Committing now to provide a rollback point should changes coming next need to be undone.