Several fixes to indentations

Added some missing tags