finish minor fixes