improvements from  craft_6

Signed-off-by: aLekSer <gdocse@gmail.com>