Adding Nameserver & Bug Fixes