Various install tweaks and tpyo fixes