Fixed bugs and made rfid more canonical.