Small TBox additions and tweaking