upload 2014-2-13

misc changes