Changes contributed by https://github.com/leo-platforms

Many and various improvements