Thick and Fast

Fixed some errors with old incompatible description fixes. Correctly
made them into merges to prevent further update conflicts. Dinosaur hat
and Diving mask now work, as well as all logic gates.