Updated docs and minor issues