Clean up some more
Add hazmat note
Add a decorator for decoders