basic optimizations + configuration changes