Slight cleaning

Slight cleaning, more to come.
Bug which makes all terrain the same type is not fixed.