second review and fixes