Updated comments and made a couple minor changes