update, minor improvements & fixes