2.0T S3 engine vs 2.0TFSI

Please excuse my ignorance.

I just saw a post in an A3 thread regarding remaps of the S3 engine, the poster referenced a review he read of the VW Golf GTI edition 30 with the same map.
I was under the impression the 30 was a VW mapped 2.0T engine, and that the S3 was really only the same block and head as the 2.0T with bigger turbo, intercooler, strengthened internals and a fruity exhaust.
Can anyone clarify this for me and maybe suggest any modest improvements to my A4 2.0T sline special edition Q Avant (220PS).

Wow, cheers for that.
I had no idea. All that potential power and only two wheels to deal with it.
I think I would have had one if they'd had 4motion.
20:20 Hindsight, wonderful!