Improving docs, shuffling things around