A few incremental changes I've made and haven't committed...