QA done, a couple fixes done to ensure most code works