chrome fixes
more variable factoring