bugs and tagging fixed