Fixed URL expanding, just generally better