Improve homework and questions