fixes as requested