making final fixes 2014-02-12