06.08.14-minor improvements