Some docs and fixes