Bunch of Fixes - mostly for tyriac
More fixes - version 3.6002
Merge pull request #1187 from waveney/wav31

Version 3.6002
Merge pull request #1188 from eternaldensity/master

Version 3.6002