tweaks and better urls