last of Jey's recommended improvements