Add some documentation to startListening
Small performance fix
Add test for Servent
Style fix