updates and fixes
return pa()
merge conflicts