fixes as per suggestions