diff --git a/README.md b/README.md
index 071ed50..f013157 100644
--- a/README.md
+++ b/README.md
@@ -21,6 +21,9 @@ Have a file called `from.yaml` with your own information structured like this:
 | `IBAN`        | string    | The IBAN of your bank account.    |
 | `BIC`         | string    | The BIC of your bank account. |
 | `bank`        | string    | The name of your bank.    |
+| `phone`       | string    | Optional. Your phone number. |
+| `email`       | string    | Optional. Your mail address. |
+| `url`         | string    | Optional. Your homepage.  |
 
 ### Example
 ```from.yaml
@@ -36,6 +39,8 @@ BIC: <BIC>
 bank: <name of bank>
 ```
 
+It's no big deal to leave some of the fields empty.
+
 ## Clients: recipients/\<rname\>.yaml
 For every clients `rname`, have a `recipients/<rname>.yaml` file structured
 like this:
@@ -48,11 +53,6 @@ like this:
 | `zip`         | int       | ZIP code of your clients address.   |
 | `city`        | string    | City correlating to the zip code. |
 | `country`     | string    | Country of your clients business address. |
-<!--
-| `IBAN`        | string    | The IBAN of your bank account.    |
-| `BIC`         | string    | The BIC of your bank account. |
-| `bank`        | string    | The name of your bank.    |
--->
 
 ### Example
 ```recipients/<rname>.yaml
diff --git a/template.tex b/template.tex
index 41a104f..b5b02ff 100644
--- a/template.tex
+++ b/template.tex
@@ -82,8 +82,8 @@
 
 % Begin document
 \begin{document}
-\begin{letter}{\VAR{to.name} \\ \VAR{to.address} \\ \VAR{to.plz}~\VAR{to.ort}
-		\BLOCK{if to.country!="Österreich"}\\\VAR{to.country}\BLOCK{endif}}
+\begin{letter}{\VAR{to.name} \\ \VAR{to.address} \\ \VAR{to.zip}~\VAR{to.city}
+		\\\VAR{to.country}}
 \setkomavar{title}{\VAR{invoice.title}}
 \opening{}