js fixes
merge conlicts