Better input handling, almost can play now