some fixes, still performance problems in execute()
some fixes, still performance problems in execute()