Add suggested changes from wiki