Tweaks and documentation