Fix timeout; maybe fix refresh