profile done and a few fixes
merge