Documentation changes
General tweaks and error handling