made regex url matching a bit better, i think