better code structure (tag files), few tweakz