Bunch of fixes, woops