various updates to nuwrf, modele and mock