Incremental improvements to build process
Large changes in order to reduce the absurd number of warnings, which were irritating me