*secondary update.  Major JS improvments