Updated callbacks to standard nodejs format of callback(err, stuff)