more JS fixin