c# file indentation. other small indentation fixes
merge