-O3, configurable from command line args, minor improvements