Edits to psql
Merge