Fixed a few more bugs, need to look at saving/loading though