Some more improvements to the executable file