Fixed a lot of bugs still stuck on base tagging