Implemented more Decoders, cleaned up stuff.