Catching comets

Tweaks to comet catching in Stargazer (see #53).