fixed weyland core
Fixes #486
Fixes #488

Fixes #487
Switchd retrieve to add-viewer
Fixes #480