Fixed issues

Testing again to see if fixes to code work