Additional Javascript tweeks