fixes as per feedback