Fixed indentation and typos in comments
Fixed embedded windows tests that were failing following