Updating for handling 2012, as well as better handling of "unexpected" versions/editions