Several fixes.. Updates from FalconUDP...