improvements & clean up