Small fixes, discovered issue with incorrect percentages, working on fix