Final improvements before publishing