some js fixes
some js fixes