optimized pustefix iterator
cleanup
naming tweaks