adding some comments and such