Cleanup
Updted documentation
Name resolution entirely done by Networkmap now