improvements due to build system