2013-05-24: minor improvements