More BSP parsing updates