Improving documentation, cache and some minor bug fixes