got rid of extra port listener, cleaned some silly bugs