F/random improvements