minor fixes as requested