fixed some url issues and removed unshortener