Debug declarations, better indent & if changed to &rest else

It's in three separate commits, one for each feature... the last one is there because I forgot to run the docs (I need to set it up as pre-commit hook or something :P)