Aggregattions

Making some minor changes to PR #9