fixes & optimizations