minor fixes -work on progress