Documentation updates
Updated docs, some refactoring fixes