2013-08-19: minor improvements