fixes as requested in review