finish off commenting, add some additional options