NERD improvements