Updated some stuff to remove some of my details, and added a few comments