fix variable shadowing
remode dictionary from tpl
fix dependecies