A few small changes to decrease lag