WIP: minor improvements of SWD