Optimized build, code improvements.