minor upgrade and hashtag initial work