6.0 done right; also cleaned out old cruft like ranged slots