Added tag importing
Misc. Improvements