fix typos and caching issues