added hashtag function
cleaning up
commits from my end
fixing merge conflicts