Fixed more bugs, going to test my lists more extensively outside of the emulator