fix indent, misc other fixes