More misc overhaul progress