cleaned up cpu_arch references and minor fixes