indentation and orthograph fixes