Meta data tidy

first two bullets for 
https://www.pivotaltracker.com/story/show/50883549