few api changes and typos