@Gargron

Excellent improvements, thank you!