Merge VanessaE's 6d facedir stuff, some random improvements