performance fixes
updates