feat: minor improvements