Added additional packet constructors and fixed up some NMS logic

Signed-off-by: Irmo van den Berge <bergerkiller@gmail.com>