Minor tweaks all around. #2