fix crashes, optimizations