First round of changes from Jos. (thanks!)