Check for issues and keep modernizing code

[BenjaminZoller]

I will check if previous issues are still relevant, and the code stability across systems.