Added NorSource; fixed single quote in node lables bug