Fixed some bugs that were FUCKING STUPID