Removed infections, token speed & touch fixes