indentation improvements
some editor improvements