added remaining location properties & fixed vh