Updated TODO, updated error code, fixed an error in errors

Signed-off-by: Sean Qureshi <sean@tox.im>