Game Almost complete

A couple of little tidy-ups.