Change normalising function to what PI said.
Add possibility of normalising subtoms inside the main average function.
Merge with branch where changed normalisation function.