Added some more comments
Renamed Connection to Gateway