some improvements to pahts
merge