minor changes to build process, code, and settings