Additions and NMS exposure fixes

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