Updated comments and such.