merge from TLDScape branch

I hope i didnt miss anything :/