Added tag commands and made few corrections