js fixes @robert