Fixed some classification and tagging issues