Don't hardcode port in several places
Change example to use psql