Tweaks to Operating system detection regex and output formatting