Indent fix, few additional corrections