miscellaneous updates - official repo is still in TFS