Fixed issue with mapper results running past where they should of and a few other bugs
Comment out this code to not cause issues when pluing initinilizes