updated some comments and such