Cleaning up

Cleaned some code, fixed obscure DNS ports