cleanup/added questions