Fixing up and optimizing some methods, Testing Codec support