Fixed up site-function.

See #15 and #17