minor changes and a new patch for nemo