Add indent() @block + minor changes

Pretty printer still needs a lot of fiddly tinkering.