issues-7 improvements & bug fixing