Some improvements, some randomness