Fixed some columns for pg
Merge branch 'working'
Fixed few bugs on PG
Test to run on pg