Improve links
Improve eggplant