Indent, trailing spaces, several new functions