New space type taxonomy plus tweaks