Minor updates
Documenation update
More minor updates