Corrected some setup procedure and documentation