Fixes many bugs, still has odd refresh problem on the main menu