Updated and added some stuff
Uncommented a line
A couple of minor changes