Fixed alotta crap