JS fix and small updates