fixed issue with hashtag URLs and made other cosmetic changes