Yet another update to get.site.data and friends. Seems to be working wel...

...l now.