Fix more stuff
need to sleep :)