Add OS check and cleanup of typos