review & fix rp6
rp09 review and fixes