Added stuff to the guide, fixed package names