performance fixes, removed dumb intersection issues