Some crap was fixed