Change metal -> hardware; a few other revisions