Added comments and some new queries