loads of little fixes to deal with refactor slips.

results in a dse unsupported error message.