renamed config files
enhanced tag behaviour