Version 2.1.0
various fixes
Various improvements.
Merge branch 'DW_master' into  redpawfx->master