Filling docs and some fixes