Changes ready for deployment to meteor.com