Updates to NMS 1.6

More will be coming but here the latest changes