bunch of crap changes around the cloth thing