2013-02-11: minor improvements