[imp] changes against issues #26,#27,#28