#47: minor changes