various improvements
Merge branch 'DW_master' into  redpawFX-master