added url shortening + bug fixes