fixes and tagging