Die, hard tabs, die

And other improvements/updates.