update: simpler structs, debug rdb