final fixes as requested by M