final minor fixes