Commets away

and some other minor cleanup