Diverse improvements