Small fixes and allow disabling of indent blocks