bug fix and game speed improvement