Improve docs and update in accordance to recent API changes