fixes for build, changed defaults for better performance