Nymph and other small fixes.