fix(): fix some types and ideas