Scala211 upgrades

ooh, are these the ones that give you structural information? regardless, looks good then!