updates for display & psql
remove debug
Merge branch 'dev'