Fixes, fuck ups and fixes