Integrating latest round of changes to ms from everyone - almost ready