moving stuff around
moving and fixing some stuff in util methods