minor level 1 js changs
damn merge conflict