Various improvements. Works with TGSL brands now.