diff --git a/content/student/studentDBDML.php b/content/student/studentDBDML.php
index 87ac75d76..b028abef5 100644
--- a/content/student/studentDBDML.php
+++ b/content/student/studentDBDML.php
@@ -1395,7 +1395,7 @@ if(!$error)
 			{
 				$zeugnisnote = new zeugnisnote($conn, null, true);
 				$error = false;
-				if(!is_numeric($_POST['matrikelnummer_'.$i]) || !is_numeric($_POST['note_'.$i]))
+				if(!is_numeric(trim($_POST['matrikelnummer_'.$i])) || !is_numeric($_POST['note_'.$i]))
 				{
 					$error = true;
 					$errormsg = "\nMatrikelnummer oder Note ist ungueltig: ".$_POST['matrikelnummer_'.$i].' - '.$_POST['note_'.$i];
@@ -1403,7 +1403,7 @@ if(!$error)
 				
 				if(!$error)
 				{
-					$qry = "SELECT student_uid FROM public.tbl_student WHERE matrikelnr='".$_POST['matrikelnummer_'.$i]."'";
+					$qry = "SELECT student_uid FROM public.tbl_student WHERE trim(matrikelnr)='".trim($_POST['matrikelnummer_'.$i])."'";
 					if($result = pg_query($conn, $qry))
 					{
 						if($row = pg_fetch_object($result))
diff --git a/content/student/studentdetailoverlay.xul.php b/content/student/studentdetailoverlay.xul.php
index 8574e9cdb..8b2e3f46e 100644
--- a/content/student/studentdetailoverlay.xul.php
+++ b/content/student/studentdetailoverlay.xul.php
@@ -81,7 +81,7 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
       						<textbox id="student-detail-textbox-geburtsort" disabled="true" maxlength="128"/>
       						<label value="Geburtsnation" control="student-detail-menulist-geburtsnation"/>
 							<menulist id="student-detail-menulist-geburtsnation" disabled="true"
-							          datasources="<?php echo APP_ROOT ?>rdf/nation.rdf.php" flex="1"
+							          datasources="<?php echo APP_ROOT ?>rdf/nation.rdf.php?optional=true" flex="1"
 						              ref="http://www.technikum-wien.at/nation/liste" >
 								<template>
 									<menupopup>
@@ -104,7 +104,7 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
     					<row>
 							<label value="Staatsbuergerschaft" control="student-detail-menulist-staatsbuergerschaft"/>
 							<menulist id="student-detail-menulist-staatsbuergerschaft" disabled="true"
-							          datasources="<?php echo APP_ROOT ?>rdf/nation.rdf.php" flex="1"
+							          datasources="<?php echo APP_ROOT ?>rdf/nation.rdf.php?optional=true" flex="1"
 						              ref="http://www.technikum-wien.at/nation/liste" >
 								<template>
 									<menupopup>
diff --git a/content/student/studentenoverlay.xul.php b/content/student/studentenoverlay.xul.php
index 765d36f3e..331435d21 100644
--- a/content/student/studentenoverlay.xul.php
+++ b/content/student/studentenoverlay.xul.php
@@ -68,7 +68,7 @@ echo '<?xul-overlay href="'.APP_ROOT.'content/student/interessentdokumenteoverla
 
 							<toolbarbutton id="student-toolbar-buchung" label="Neue Buchung" oncommand="StudentKontoNeu()" disabled="false" tooltiptext="neue Buchung anlegen"/>
 							
-							<toolbarbutton label="Status ändern " type="menu">							
+							<toolbarbutton label="Status ändern " id="student-toolbar-status" type="menu">							
 						      <menupopup id="student-status-menu-popup" >
 								    <menuitem id="student-toolbar-abbrecher" label="-> Abbrecher" oncommand="StudentAddRolle('Abbrecher','0')" disabled="false" tooltiptext="Student zum Abbrecher machen" hidden="true"/>
 									<menuitem id="student-toolbar-unterbrecher" label="-> Unterbrecher" oncommand="StudentAddRolle('Unterbrecher','0')" disabled="false" tooltiptext="Student zum Unterbrecher machen" hidden="true"/>
diff --git a/content/student/studentoverlay.js.php b/content/student/studentoverlay.js.php
index 67fe2c4d7..d80dc8925 100644
--- a/content/student/studentoverlay.js.php
+++ b/content/student/studentoverlay.js.php
@@ -741,6 +741,13 @@ function StudentAuswahl()
 	verband=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#verband" ));
 	gruppe=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#gruppe" ));
 	prestudent_id=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#prestudent_id" ));
+	status=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#status" ));
+	
+	//Bei Incoming wird das Menue zur Statusaenderung deaktiviert
+	if(status=='Incoming')
+		document.getElementById('student-toolbar-status').disabled=true;
+	else
+		document.getElementById('student-toolbar-status').disabled=false;
 
 	//Daten den Feldern zuweisen
 
diff --git a/rdf/nation.rdf.php b/rdf/nation.rdf.php
index 703698cbd..1ee88d949 100644
--- a/rdf/nation.rdf.php
+++ b/rdf/nation.rdf.php
@@ -36,6 +36,25 @@ $rdf_url='http://www.technikum-wien.at/nation';
 >
    <RDF:Seq about="<?php echo $rdf_url ?>/liste">
 <?php
+if(isset($_GET['optional']) && $_GET['optional']=='true')
+{
+	?>
+      <RDF:li>
+         <RDF:Description  id=""  about="<?php echo $rdf_url.'/'; ?>" >
+            <NATION:nation_code><![CDATA[]]></NATION:nation_code>
+            <NATION:entwicklungsstand><![CDATA[]]></NATION:entwicklungsstand>
+            <NATION:eu><![CDATA[]]></NATION:eu>
+            <NATION:ewr><![CDATA[]]></NATION:ewr>
+            <NATION:kontinent><![CDATA[]]></NATION:kontinent>
+            <NATION:kurztext><![CDATA[-- keine Auswahl --]]></NATION:kurztext>
+            <NATION:langtext><![CDATA[-- keine Auswahl --]]></NATION:langtext>
+            <NATION:engltext><![CDATA[-- keine Auswahl --]]></NATION:engltext>
+            <NATION:sperre><![CDATA[false]]></NATION:sperre>
+         </RDF:Description>
+      </RDF:li>
+<?php
+}
+
 foreach ($nation->nation as $row)
 {
 	?>
diff --git a/rdf/studienerfolg.rdf.php b/rdf/studienerfolg.rdf.php
index 6150b76b9..332e4c160 100644
--- a/rdf/studienerfolg.rdf.php
+++ b/rdf/studienerfolg.rdf.php
@@ -146,7 +146,7 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
 					$xml .= "			<unterrichtsfach>";
 					$xml .= "				<bezeichnung><![CDATA[".$row->lehrveranstaltung_bezeichnung."]]></bezeichnung>";
 					$xml .= "				<note>".$note."</note>";
-					$xml .= "				<sws>".sprintf('%.1f',$row->semesterstunden/$wochen)."</sws>";
+					$xml .= "				<sws>".sprintf('%.1f',$row->semesterstunden)."</sws>"; ///$wochen
 					$xml .= "				<ects>".$row->ects."</ects>";
 					if($row->benotungsdatum!='')
 						$xml .= "				<benotungsdatum>".date('d.m.Y',$datum->mktime_fromtimestamp($row->benotungsdatum))."</benotungsdatum>";
diff --git a/vilesci/admin/xslvorlagen/zeugnis.xsl b/vilesci/admin/xslvorlagen/zeugnis.xsl
index 909fd2950..f485e04bc 100644
--- a/vilesci/admin/xslvorlagen/zeugnis.xsl
+++ b/vilesci/admin/xslvorlagen/zeugnis.xsl
@@ -18,7 +18,7 @@
 			<fo:page-sequence master-reference="PageMaster">
 				<fo:flow flow-name="xsl-region-body" >
 	
-					<fo:block-container position="absolute" top="42mm" left="25mm" height="20mm">
+					<fo:block-container position="absolute" top="25mm" left="30mm" height="20mm">
 						<fo:block text-align="left" line-height="20pt" font-family="sans-serif" font-size="18pt">
 							<fo:inline font-weight="900">
 							<xsl:text>Zeugnis </xsl:text><xsl:value-of select="studiensemester" />
@@ -27,7 +27,7 @@
 						</fo:block>
 					</fo:block-container> 
 						
-					<fo:block-container position="absolute" top="63mm" left="25mm" height="20mm">
+					<fo:block-container position="absolute" top="46mm" left="30mm" height="20mm">
 						<fo:block text-align="left" line-height="20pt" font-family="sans-serif" font-size="18pt">
 							<fo:inline font-weight="900">
 							<xsl:value-of select="studiengang_art" />\n
@@ -38,30 +38,31 @@
 					
 
 
-					<fo:block-container position="absolute" top="85mm" left="145mm">
+					<fo:block-container position="absolute" top="68mm" left="140mm">
 						<fo:block line-height="14pt" font-family="sans-serif" font-size="10pt">
-							<xsl:text>Personenkennzahl: </xsl:text>
+							<xsl:text>Personenkennzeichen: </xsl:text>
 						</fo:block>
 					</fo:block-container>
-					<fo:block-container position="absolute" top="85mm" left="177mm">
+					<fo:block-container position="absolute" top="68mm" left="177mm">
 						<fo:block content-width="80mm" line-height="14pt" font-family="sans-serif" font-size="10pt" font-weight="bold">
 							<xsl:value-of select="matrikelnr" />
 						</fo:block>
 					</fo:block-container>
-					<fo:block-container position="absolute" top="90mm" left="143mm">
+					<fo:block-container position="absolute" top="73mm" left="143mm">
 						<fo:block line-height="14pt" font-family="sans-serif" font-size="10pt">
 							<xsl:text>Kennzahl des Studiengangs: </xsl:text>
 						</fo:block>
 					</fo:block-container>
-					<fo:block-container position="absolute" top="90mm" left="189mm">
+					<fo:block-container position="absolute" top="73mm" left="189mm">
 						<fo:block content-width="80mm" line-height="14pt" font-family="sans-serif" font-size="10pt" font-weight="bold">
 							<xsl:value-of select="studiengang_kz" />
 						</fo:block>
 					</fo:block-container> 
 
-					<fo:block-container position="absolute" top="102mm" left="25mm" height="10mm">
+					<fo:block-container position="absolute" top="85mm" left="30mm" height="10mm">
 						<fo:table table-layout="fixed" border-collapse="separate">
 						    <fo:table-column column-width="45mm"/>
+						    <fo:table-column column-width="100mm"/>
 								<fo:table-body>
 						            <fo:table-row line-height="14pt">
 										<fo:table-cell>
@@ -70,7 +71,7 @@
 											</fo:block>
 									</fo:table-cell>
 									<fo:table-cell>
-											<fo:block font-family="sans-serif" font-size="12pt" content-width="45mm" text-align="left">
+											<fo:block font-family="sans-serif" font-size="12pt" content-width="100mm" text-align="left">
 												<fo:inline font-weight="900"><xsl:value-of select="name" /></fo:inline>
 											</fo:block>
 									</fo:table-cell>
@@ -91,7 +92,7 @@
 						</fo:table>
 					</fo:block-container>
  
- 					<fo:block-container position="absolute" top="118mm" left="25mm">
+ 					<fo:block-container position="absolute" top="101mm" left="30mm">
 						<fo:table table-layout="fixed" border-collapse="separate" border-width="2pt" border-style="solid">
 						<fo:table-column column-width="85mm"/>
 						<fo:table-column column-width="30mm"/>
@@ -157,7 +158,7 @@
 						</fo:table>
 					</fo:block-container>
 					
-					<fo:block-container position="absolute" top="250mm" left="25mm" height="10mm">
+					<fo:block-container position="absolute" top="250mm" left="30mm" height="10mm">
 						<fo:table table-layout="fixed" border-collapse="separate">
 						<fo:table-column column-width="75mm"/>
 						<fo:table-column column-width="15mm"/>
@@ -174,7 +175,7 @@
 										</fo:block>
 									</fo:table-cell>
 									<fo:table-cell>
-										<fo:block font-size="8pt" content-width="75mm" text-align="center">
+										<fo:block font-size="10pt" content-width="75mm" text-align="center">
 										<xsl:value-of select="ort_datum" />
 										</fo:block>
 									</fo:table-cell>
@@ -195,16 +196,16 @@
 								
 								<fo:table-row  line-height="12pt">
 									<fo:table-cell>
-										<fo:block font-size="8pt" content-width="75mm" text-align="center">
+										<fo:block font-size="10pt" content-width="75mm" text-align="center">
 											<xsl:value-of select="studiengangsleiter" />
-											<xsl:text>\nStudiengangsleiter</xsl:text>
+											<xsl:text>\nStudiengangsleitung</xsl:text>
 										</fo:block></fo:table-cell>
 									<fo:table-cell>
 										<fo:block>
 										</fo:block>
 									</fo:table-cell>
 									<fo:table-cell>
-										<fo:block font-size="8pt" content-width="75mm" text-align="center">
+										<fo:block font-size="10pt" content-width="75mm" text-align="center">
 										Ort, Datum
 										</fo:block>
 									</fo:table-cell>
@@ -212,7 +213,7 @@
 								
 								<fo:table-row  line-height="10pt">
 									<fo:table-cell number-columns-spanned="3">
-										<fo:block font-size="8pt" content-width="165mm" text-align="center">
+										<fo:block font-size="10pt" content-width="165mm" text-align="center">
 											<xsl:text>Fachhochschule Technikum Wien\nHöchstädtplatz 5\nA-1200 Wien\nZVR-Nr.: 074476426\nDVR-Nr.:0928381</xsl:text>
 										</fo:block></fo:table-cell>
 								</fo:table-row>
@@ -233,10 +234,10 @@
 	
 	<xsl:template match="unterrichtsfach">
 		<fo:table-row  line-height="16pt">
-			<fo:table-cell border-width="0.2mm" border-style="solid" ><fo:block font-size="12pt" content-width="85mm"><xsl:text> </xsl:text><xsl:value-of select="bezeichnung" /></fo:block></fo:table-cell>
-			<fo:table-cell border-width="0.2mm" border-style="solid" ><fo:block font-size="12pt" content-width="30mm" text-align="center"><xsl:text> </xsl:text><xsl:value-of select="note" /></fo:block></fo:table-cell>
-			<fo:table-cell border-width="0.2mm" border-style="solid" ><fo:block font-size="12pt" content-width="25mm" text-align="center"><xsl:text> </xsl:text><xsl:value-of select="sws" /></fo:block></fo:table-cell>
-			<fo:table-cell border-width="0.2mm" border-style="solid" ><fo:block font-size="12pt" content-width="25mm" text-align="center"><xsl:text> </xsl:text><xsl:value-of select="ects" /></fo:block></fo:table-cell>
+			<fo:table-cell border-width="0.2mm" border-style="solid" ><fo:block font-size="11pt" content-width="85mm"><xsl:text> </xsl:text><xsl:value-of select="bezeichnung" /></fo:block></fo:table-cell>
+			<fo:table-cell border-width="0.2mm" border-style="solid" ><fo:block font-size="11pt" content-width="30mm" text-align="center"><xsl:text> </xsl:text><xsl:value-of select="note" /></fo:block></fo:table-cell>
+			<fo:table-cell border-width="0.2mm" border-style="solid" ><fo:block font-size="11pt" content-width="25mm" text-align="center"><xsl:text> </xsl:text><xsl:value-of select="sws" /></fo:block></fo:table-cell>
+			<fo:table-cell border-width="0.2mm" border-style="solid" ><fo:block font-size="11pt" content-width="25mm" text-align="center"><xsl:text> </xsl:text><xsl:value-of select="ects" /></fo:block></fo:table-cell>
 		</fo:table-row>
 	</xsl:template>