fix & more api ref