Adds some site aggregation features and bugfixes