Added comments and things