address first review comments