I've made both of these changes, thanks.