Small tweaks and update documentation