Add untagged files support + Fix bugs