Improved CodecLookupService

- Minor changes to other classes

Signed-off-by: thehutch <th3hutch@yahoo.co.uk>