use indent=2, optionally merge issue2 and 16, other minor fixes