s2w fixups for testing

Signed-off-by: Bryan Smith <zarboz@gmail.com>
debug output

Signed-off-by: Bryan Smith <zarboz@gmail.com>