final touches before PR