minor updates
performance fixes