update as of 2014-02

see commits for details