did some stuff
Merge branch 'tg'