2013-02-12: minor improvements