feat: minor improvements, API options suppor