random misc improvement