Fixed more minor bugs and moved shit around