Tidying things up
Fixes #1 probably... no comets listed on pccp to test :)