Added draw and gofish, end match, some aesthetics.