Added Kickplate to NOR, misc updates.