Tweaks and documentation chnages