Add general improvements before presentation