big commit lots of changes for ms figures