Fixed some bugs
Merge branch 'within_group' of https://github.com/davidfetter/postgresql_projects into within_group