[2.0.0] random improvements