API enhancements; fix typos