shortener improvments