Lots of docs, some changes in util