Making the raw API actually try to decode
might be a good thing...

Also resolved race conditions in CLI tool

Signed-off-by: Luca Fulchir <luker@fenrirproject.org>