fixes as per review