last working minor fixes