tidied up imports
tweaked some hydrat options