Timing fixes, more work on space game sample