welcome set, js few fix