Flesh out Cnidam rooms 340 and 461 and Sarvari room 460