tweaks to eureka, moved utils