Added autotag and some more changes