Minor tweaks. Accidently rebased over myself. Need to be more careful.