Changes on Linux and minor tweaks
Adding missing file