More debugging output
More more debug
Support for average=false parameter
Fix typo
Revert "More more debug"

This reverts commit 86b3f57a779a716fd77493652c78d714869cff9d.
Revert "More debugging output"

This reverts commit 5edc4c45c5dbb636e23db25c8a51029552f70ba3.
Add specs