Fix hydrater lib link
Fixes & improvements