Added suggestions and corrections from the public