Add option for switch indenting; bugfixes