#475. Js fixes and additions.