added hstore stuff
merged changes