Working on JS logic; bug fixes