cleaned up code. uncommented KeyServer check.