Double check and improvement suggestions

https://opengeofiction.net/user/ImmortalHawk/diary/2252