Gaps identation, fixed a few mistypes, returned some code to its previous state.