added Nightmare cardboard #462 and some clean-up