Word wrapping, explicit returning of expressions is no longer necessary, minor tweaks and documentation updates