Smarter siteinfo gather

Fixes #21