Properly implement angle wrapping
wip stats logging
Merge branch 'master' into neat_ex