Issue #45 #46

And a real level with one minute game play. Code clean up.