tweak urls and error messages