experiment with decoders
more renaming and some more docs