more BEM
merge
fix variables