Bring model and code closer

Simplyfy enough code
Promote W to DW and fix DW lies bug