First round of suggested improvements