Changed some things, commented some others.