feat: small improvements