Speed upds and fixes