Several updates
edited views for posting
keeping pg, fixing merge conflict