minor additions to indent rules, also fixes #6