add indenting, closes #1 and closes #3.  closes #5