tweaks and js formatting