Improve docs WIP