more improvements & verifications