Bump version dates, remove // commenting, fix a minor options bug