Few more changes, and added pg to gemfile