* extensive overhaul
+ angle distributions