Guide update

Some improvements to guide 7