Minor improvements - free T-Shirt!