Better way to handle post urls and other tweaks