2013-07-03: minor improvements