simplify bsp builder and move towards correct ordering