tagging, commenting, other cleanup