fasd
added a few more tags and fixed for bug