Committing updates

updates as of 5/1/2014