2014-01-12: little improvements