Cleaned up the name_server code a little,  Fixed Issue #2