Updated documentation and misc tweaks