Fixed a few glaring bugs, it's still borked