More js tweaks