fixes as suggested from reviews