Feature/game duration

There are even a couple more fixes / updates.