some wtfs fixed