Added comments and such