- bunch of clean ups according to latest open peer protocol specification document