Index games2

For some strange reason I was not able to merge "master" back onto "index_games" ... it simply overwrote all my changes.

So I have put the necessary changes on the "index_games2" branch.