Improved a few bits and pieces and refreshed docs