improvements & updates