fix js, final fixing