Some improvements to help with multi-node hadoop