Light fix and tweaks to TES2