update based on discussion with Joachim

1 files changed, 220 insertions, 119 deletions

diff --git a/hsm-board.graffle b/hsm-board.graffle
index f8aa517..98723c8 100644
--- a/hsm-board.graffle
+++ b/hsm-board.graffle
@@ -7,14 +7,14 @@
 	<key>ApplicationVersion</key>
 	<array>
 		<string>com.omnigroup.OmniGraffle6</string>
-		<string>159.2.0.222945</string>
+		<string>159.7.0.224654</string>
 	</array>
 	<key>AutoAdjust</key>
 	<false/>
 	<key>BackgroundGraphic</key>
 	<dict>
 		<key>Bounds</key>
-		<string>{{0, 0}, {818, 559}}</string>
+		<string>{{0, 0}, {783, 559}}</string>
 		<key>Class</key>
 		<string>SolidGraphic</string>
 		<key>ID</key>
@@ -61,6 +61,96 @@
 			<key>Head</key>
 			<dict>
 				<key>ID</key>
+				<integer>154</integer>
+			</dict>
+			<key>ID</key>
+			<integer>258</integer>
+			<key>Layer</key>
+			<integer>0</integer>
+			<key>Points</key>
+			<array>
+				<string>{381.06693255685428, 227.18942619211924}</string>
+				<string>{429.06298469487933, 285.29964307344687}</string>
+			</array>
+			<key>Style</key>
+			<dict>
+				<key>shadow</key>
+				<dict>
+					<key>Draws</key>
+					<string>NO</string>
+				</dict>
+				<key>stroke</key>
+				<dict>
+					<key>HeadArrow</key>
+					<string>0</string>
+					<key>Legacy</key>
+					<false/>
+					<key>LineType</key>
+					<integer>1</integer>
+					<key>TailArrow</key>
+					<string>0</string>
+				</dict>
+			</dict>
+			<key>Tail</key>
+			<dict>
+				<key>ID</key>
+				<integer>257</integer>
+			</dict>
+		</dict>
+		<dict>
+			<key>Bounds</key>
+			<string>{{371.14567262431751, 213.01619792826426}, {19.842519865073541, 28.346456527709961}}</string>
+			<key>Class</key>
+			<string>ShapedGraphic</string>
+			<key>FontInfo</key>
+			<dict>
+				<key>Font</key>
+				<string>Helvetica</string>
+				<key>Size</key>
+				<real>7</real>
+			</dict>
+			<key>ID</key>
+			<integer>257</integer>
+			<key>Layer</key>
+			<integer>0</integer>
+			<key>Style</key>
+			<dict>
+				<key>shadow</key>
+				<dict>
+					<key>Draws</key>
+					<string>NO</string>
+				</dict>
+			</dict>
+			<key>Text</key>
+			<dict>
+				<key>Pad</key>
+				<integer>1</integer>
+				<key>Text</key>
+				<string>{\rtf1\ansi\ansicpg1252\cocoartf1344\cocoasubrtf720
+{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+{\colortbl;\red255\green255\blue255;}
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc
+
+\f0\fs14 \cf0 JTAG}</string>
+				<key>VerticalPad</key>
+				<integer>0</integer>
+			</dict>
+			<key>TextRotation</key>
+			<real>90</real>
+		</dict>
+		<dict>
+			<key>Class</key>
+			<string>LineGraphic</string>
+			<key>FontInfo</key>
+			<dict>
+				<key>Font</key>
+				<string>Helvetica</string>
+				<key>Size</key>
+				<real>12</real>
+			</dict>
+			<key>Head</key>
+			<dict>
+				<key>ID</key>
 				<integer>210</integer>
 			</dict>
 			<key>ID</key>
@@ -69,8 +159,8 @@
 			<integer>0</integer>
 			<key>Points</key>
 			<array>
-				<string>{239.67323010821974, 125.62992217287302}</string>
-				<string>{364.25196055375568, 227.18942619211924}</string>
+				<string>{245.34252149824081, 121.29921356289404}</string>
+				<string>{348.66142048629246, 227.18942619211924}</string>
 			</array>
 			<key>Style</key>
 			<dict>
@@ -101,7 +191,7 @@
 		</dict>
 		<dict>
 			<key>Bounds</key>
-			<string>{{194.17323010821974, 110.62992217287302}, {91, 30}}</string>
+			<string>{{199.84252149824081, 106.29921356289404}, {91, 30}}</string>
 			<key>Class</key>
 			<string>ShapedGraphic</string>
 			<key>FitText</key>
@@ -140,13 +230,13 @@
 			<key>Text</key>
 			<dict>
 				<key>Text</key>
-				<string>{\rtf1\ansi\ansicpg1252\cocoartf1343\cocoasubrtf160
+				<string>{\rtf1\ansi\ansicpg1252\cocoartf1344\cocoasubrtf720
 {\fonttbl\f0\fnil\fcharset0 HelveticaNeue;}
 {\colortbl;\red255\green255\blue255;}
 \deftab720
 \pard\pardeftab720\qc
 
-\f0\i\fs16 \cf0 JTAG port for\
+\f0\i\fs16 \cf0 JTAG port(s) for\
 testing and debugging}</string>
 			</dict>
 			<key>Wrap</key>
@@ -173,7 +263,7 @@ testing and debugging}</string>
 			<integer>0</integer>
 			<key>Points</key>
 			<array>
-				<string>{221.82677315811472, 175.19685190808107}</string>
+				<string>{199.1496071730073, 163.85826891552736}</string>
 				<string>{300.0865824241771, 227.18942619211924}</string>
 			</array>
 			<key>Style</key>
@@ -205,7 +295,7 @@ testing and debugging}</string>
 		</dict>
 		<dict>
 			<key>Bounds</key>
-			<string>{{165.82677315811472, 160.19685190808107}, {112, 30}}</string>
+			<string>{{138.6496071730073, 148.85826891552736}, {121, 30}}</string>
 			<key>Class</key>
 			<string>ShapedGraphic</string>
 			<key>FitText</key>
@@ -244,14 +334,14 @@ testing and debugging}</string>
 			<key>Text</key>
 			<dict>
 				<key>Text</key>
-				<string>{\rtf1\ansi\ansicpg1252\cocoartf1343\cocoasubrtf160
+				<string>{\rtf1\ansi\ansicpg1252\cocoartf1344\cocoasubrtf720
 {\fonttbl\f0\fnil\fcharset0 HelveticaNeue;}
 {\colortbl;\red255\green255\blue255;}
 \deftab720
 \pard\pardeftab720\qc
 
-\f0\i\fs16 \cf0 At least two entropy sources\
-connected to the FPGA}</string>
+\f0\i\fs16 \cf0 At least one external entropy\
+source connected to the FPGA}</string>
 			</dict>
 			<key>Wrap</key>
 			<string>NO</string>
@@ -269,15 +359,15 @@ connected to the FPGA}</string>
 			<key>Head</key>
 			<dict>
 				<key>ID</key>
-				<integer>168</integer>
+				<integer>265</integer>
 			</dict>
 			<key>ID</key>
-			<integer>246</integer>
+			<integer>268</integer>
 			<key>Layer</key>
 			<integer>0</integer>
 			<key>Points</key>
 			<array>
-				<string>{340.68897892649704, 125.62992217287302}</string>
+				<string>{344.48819248939105, 116.4566936978205}</string>
 				<string>{429.06298469487933, 227.18942619211924}</string>
 			</array>
 			<key>Style</key>
@@ -309,7 +399,7 @@ connected to the FPGA}</string>
 		</dict>
 		<dict>
 			<key>Bounds</key>
-			<string>{{294.18897892649704, 100.62992217287302}, {93, 50}}</string>
+			<string>{{297.98819248939105, 86.456693697820498}, {93, 60}}</string>
 			<key>Class</key>
 			<string>ShapedGraphic</string>
 			<key>FitText</key>
@@ -348,16 +438,17 @@ connected to the FPGA}</string>
 			<key>Text</key>
 			<dict>
 				<key>Text</key>
-				<string>{\rtf1\ansi\ansicpg1252\cocoartf1343\cocoasubrtf160
+				<string>{\rtf1\ansi\ansicpg1252\cocoartf1344\cocoasubrtf720
 {\fonttbl\f0\fnil\fcharset0 HelveticaNeue;}
 {\colortbl;\red255\green255\blue255;}
 \deftab720
 \pard\pardeftab720\qc
 
-\f0\i\fs16 \cf0 USB Client interface\
+\f0\i\fs16 \cf0 Client interface\
 for HSM management\
 and for communicating\
-with applications}</string>
+with applications\
+(e.g., USB to SPI)}</string>
 			</dict>
 			<key>Wrap</key>
 			<string>NO</string>
@@ -452,7 +543,7 @@ with applications}</string>
 			<key>Text</key>
 			<dict>
 				<key>Text</key>
-				<string>{\rtf1\ansi\ansicpg1252\cocoartf1343\cocoasubrtf160
+				<string>{\rtf1\ansi\ansicpg1252\cocoartf1344\cocoasubrtf720
 {\fonttbl\f0\fnil\fcharset0 HelveticaNeue;}
 {\colortbl;\red255\green255\blue255;}
 \deftab720
@@ -587,7 +678,7 @@ encrypted application keys}</string>
 			<integer>0</integer>
 			<key>Points</key>
 			<array>
-				<string>{108.9409453576944, 343.40985995477433}</string>
+				<string>{108.9409453576944, 343.4098599547745}</string>
 				<string>{235.92120429459848, 343.4098599547745}</string>
 			</array>
 			<key>Style</key>
@@ -617,7 +708,7 @@ encrypted application keys}</string>
 		</dict>
 		<dict>
 			<key>Bounds</key>
-			<string>{{52.440945357694396, 323.40985995477433}, {113, 40}}</string>
+			<string>{{45.44094535769441, 313.4098599547745}, {127, 60}}</string>
 			<key>Class</key>
 			<string>ShapedGraphic</string>
 			<key>FitText</key>
@@ -656,15 +747,17 @@ encrypted application keys}</string>
 			<key>Text</key>
 			<dict>
 				<key>Text</key>
-				<string>{\rtf1\ansi\ansicpg1252\cocoartf1343\cocoasubrtf160
+				<string>{\rtf1\ansi\ansicpg1252\cocoartf1344\cocoasubrtf720
 {\fonttbl\f0\fnil\fcharset0 HelveticaNeue;}
 {\colortbl;\red255\green255\blue255;}
 \deftab720
 \pard\pardeftab720\qc
 
-\f0\i\fs16 \cf0 Master Key Memory\
+\f0\i\fs16 \cf0 RAM-based Master Key Memory\
 contains the symmetric key\
-used to encrypt the Keystore}</string>
+used to encrypt the Keystore\
+(~ 1024 bit) power supply\
+controlled by tamper circuit}</string>
 			</dict>
 			<key>Wrap</key>
 			<string>NO</string>
@@ -862,7 +955,7 @@ Key Memory upon tamper}</string>
 			<key>Text</key>
 			<dict>
 				<key>Text</key>
-				<string>{\rtf1\ansi\ansicpg1252\cocoartf1343\cocoasubrtf160
+				<string>{\rtf1\ansi\ansicpg1252\cocoartf1344\cocoasubrtf720
 {\fonttbl\f0\fnil\fcharset0 HelveticaNeue;}
 {\colortbl;\red255\green255\blue255;}
 \deftab720
@@ -897,7 +990,7 @@ during development}</string>
 			<key>Points</key>
 			<array>
 				<string>{429.06298469487933, 76.692914112721837}</string>
-				<string>{429.06298469487933, 151.55950422912957}</string>
+				<string>{429.06298469487933, 132.28346543396552}</string>
 			</array>
 			<key>Style</key>
 			<dict>
@@ -945,8 +1038,8 @@ during development}</string>
 			<integer>0</integer>
 			<key>Points</key>
 			<array>
-				<string>{560.04721590275449, 76.692914112721837}</string>
-				<string>{485.75587619115618, 227.18942619211924}</string>
+				<string>{560.04721590275449, 81.692914112721837}</string>
+				<string>{496.57873353282167, 227.18942619211924}</string>
 			</array>
 			<key>Style</key>
 			<dict>
@@ -975,7 +1068,7 @@ during development}</string>
 		</dict>
 		<dict>
 			<key>Bounds</key>
-			<string>{{486.04721590275454, 56.69291411272183}, {148, 40}}</string>
+			<string>{{486.04721590275454, 56.69291411272183}, {148, 50}}</string>
 			<key>Class</key>
 			<string>ShapedGraphic</string>
 			<key>FitText</key>
@@ -1014,15 +1107,16 @@ during development}</string>
 			<key>Text</key>
 			<dict>
 				<key>Text</key>
-				<string>{\rtf1\ansi\ansicpg1252\cocoartf1343\cocoasubrtf160
+				<string>{\rtf1\ansi\ansicpg1252\cocoartf1344\cocoasubrtf720
 {\fonttbl\f0\fnil\fcharset0 HelveticaNeue;}
 {\colortbl;\red255\green255\blue255;}
 \deftab720
 \pard\pardeftab720\qc
 
-\f0\i\fs16 \cf0 USB Host interface for connecting\
+\f0\i\fs16 \cf0 Interface for connecting\
 Security Officer authenticators and \
-storage devices for master key backup}</string>
+storage devices for master key backup\
+(e.g., USB Host, Smartcard)}</string>
 			</dict>
 			<key>Wrap</key>
 			<string>NO</string>
@@ -1068,7 +1162,7 @@ storage devices for master key backup}</string>
 			<key>Text</key>
 			<dict>
 				<key>Text</key>
-				<string>{\rtf1\ansi\ansicpg1252\cocoartf1343\cocoasubrtf160
+				<string>{\rtf1\ansi\ansicpg1252\cocoartf1344\cocoasubrtf720
 {\fonttbl\f0\fnil\fcharset0 HelveticaNeue;}
 {\colortbl;\red255\green255\blue255;}
 \deftab720
@@ -1082,6 +1176,59 @@ PKCS#11  provider}</string>
 			<string>NO</string>
 		</dict>
 		<dict>
+			<key>Bounds</key>
+			<string>{{480.80568461609931, 278.29964307344687}, {51, 14}}</string>
+			<key>Class</key>
+			<string>ShapedGraphic</string>
+			<key>FitText</key>
+			<string>YES</string>
+			<key>Flow</key>
+			<string>Resize</string>
+			<key>ID</key>
+			<integer>260</integer>
+			<key>Layer</key>
+			<integer>1</integer>
+			<key>Line</key>
+			<dict>
+				<key>ID</key>
+				<integer>173</integer>
+				<key>Position</key>
+				<real>0.4552384629818324</real>
+				<key>RotationType</key>
+				<integer>0</integer>
+			</dict>
+			<key>Style</key>
+			<dict>
+				<key>shadow</key>
+				<dict>
+					<key>Draws</key>
+					<string>NO</string>
+				</dict>
+				<key>stroke</key>
+				<dict>
+					<key>Draws</key>
+					<string>NO</string>
+				</dict>
+			</dict>
+			<key>Text</key>
+			<dict>
+				<key>Pad</key>
+				<integer>2</integer>
+				<key>Text</key>
+				<string>{\rtf1\ansi\ansicpg1252\cocoartf1344\cocoasubrtf720
+{\fonttbl\f0\fnil\fcharset0 HelveticaNeue;}
+{\colortbl;\red255\green255\blue255;}
+\deftab720
+\pard\pardeftab720\qc
+
+\f0\i\fs16 \cf0 status (serial)}</string>
+				<key>VerticalPad</key>
+				<integer>2</integer>
+			</dict>
+			<key>Wrap</key>
+			<string>NO</string>
+		</dict>
+		<dict>
 			<key>Class</key>
 			<string>LineGraphic</string>
 			<key>FontInfo</key>
@@ -1192,7 +1339,7 @@ PKCS#11  provider}</string>
 			<key>Head</key>
 			<dict>
 				<key>ID</key>
-				<integer>168</integer>
+				<integer>265</integer>
 			</dict>
 			<key>ID</key>
 			<integer>224</integer>
@@ -1200,7 +1347,7 @@ PKCS#11  provider}</string>
 			<integer>1</integer>
 			<key>Points</key>
 			<array>
-				<string>{429.06298469487933, 151.55950422912957}</string>
+				<string>{429.06298469487933, 132.28346543396552}</string>
 				<string>{429.06298469487933, 227.18942619211924}</string>
 			</array>
 			<key>Style</key>
@@ -1230,7 +1377,7 @@ PKCS#11  provider}</string>
 		</dict>
 		<dict>
 			<key>Bounds</key>
-			<string>{{403.55118469487934, 137.38627596527459}, {51.023600000000002, 28.346456527709961}}</string>
+			<string>{{395.04723635475341, 118.11023717011054}, {68.031496680251806, 28.346456527709961}}</string>
 			<key>Class</key>
 			<string>ShapedGraphic</string>
 			<key>FontInfo</key>
@@ -1267,13 +1414,13 @@ PKCS#11  provider}</string>
 			<key>Text</key>
 			<dict>
 				<key>Text</key>
-				<string>{\rtf1\ansi\ansicpg1252\cocoartf1343\cocoasubrtf160
+				<string>{\rtf1\ansi\ansicpg1252\cocoartf1344\cocoasubrtf720
 {\fonttbl\f0\fswiss\fcharset0 Helvetica;}
 {\colortbl;\red255\green255\blue255;}
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc
 
 \f0\fs16 \cf0 PKCS#11\
-Driver}</string>
+provider in host}</string>
 				<key>VerticalPad</key>
 				<integer>0</integer>
 			</dict>
@@ -1601,7 +1748,7 @@ Memory}</string>
 			<integer>1</integer>
 			<key>Points</key>
 			<array>
-				<string>{364.25196055375568, 227.18942619211924}</string>
+				<string>{348.66142048629246, 227.18942619211924}</string>
 				<string>{300.0865824241771, 285.29964307344687}</string>
 			</array>
 			<key>Style</key>
@@ -1630,57 +1777,8 @@ Memory}</string>
 			</dict>
 		</dict>
 		<dict>
-			<key>Class</key>
-			<string>LineGraphic</string>
-			<key>FontInfo</key>
-			<dict>
-				<key>Font</key>
-				<string>Helvetica</string>
-				<key>Size</key>
-				<real>12</real>
-			</dict>
-			<key>Head</key>
-			<dict>
-				<key>ID</key>
-				<integer>154</integer>
-			</dict>
-			<key>ID</key>
-			<integer>211</integer>
-			<key>Layer</key>
-			<integer>1</integer>
-			<key>Points</key>
-			<array>
-				<string>{364.25196055375568, 227.18942619211924}</string>
-				<string>{429.06298469487933, 285.29964307344687}</string>
-			</array>
-			<key>Style</key>
-			<dict>
-				<key>shadow</key>
-				<dict>
-					<key>Draws</key>
-					<string>NO</string>
-				</dict>
-				<key>stroke</key>
-				<dict>
-					<key>HeadArrow</key>
-					<string>0</string>
-					<key>Legacy</key>
-					<false/>
-					<key>LineType</key>
-					<integer>1</integer>
-					<key>TailArrow</key>
-					<string>0</string>
-				</dict>
-			</dict>
-			<key>Tail</key>
-			<dict>
-				<key>ID</key>
-				<integer>210</integer>
-			</dict>
-		</dict>
-		<dict>
 			<key>Bounds</key>
-			<string>{{338.74016055375569, 213.01619792826426}, {51.023600000000002, 28.346456527709961}}</string>
+			<string>{{338.74016055375569, 213.01619792826426}, {19.842519865073541, 28.346456527709961}}</string>
 			<key>Class</key>
 			<string>ShapedGraphic</string>
 			<key>FontInfo</key>
@@ -1688,7 +1786,7 @@ Memory}</string>
 				<key>Font</key>
 				<string>Helvetica</string>
 				<key>Size</key>
-				<real>8</real>
+				<real>7</real>
 			</dict>
 			<key>ID</key>
 			<integer>210</integer>
@@ -1704,16 +1802,20 @@ Memory}</string>
 			</dict>
 			<key>Text</key>
 			<dict>
+				<key>Pad</key>
+				<integer>1</integer>
 				<key>Text</key>
-				<string>{\rtf1\ansi\ansicpg1252\cocoartf1343\cocoasubrtf160
+				<string>{\rtf1\ansi\ansicpg1252\cocoartf1344\cocoasubrtf720
 {\fonttbl\f0\fswiss\fcharset0 Helvetica;}
 {\colortbl;\red255\green255\blue255;}
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc
 
-\f0\fs16 \cf0 JTAG}</string>
+\f0\fs14 \cf0 JTAG}</string>
 				<key>VerticalPad</key>
 				<integer>0</integer>
 			</dict>
+			<key>TextRotation</key>
+			<real>90</real>
 		</dict>
 		<dict>
 			<key>Class</key>
@@ -1834,7 +1936,7 @@ Memory}</string>
 			<integer>1</integer>
 			<key>Points</key>
 			<array>
-				<string>{485.75587619115618, 227.18942619211924}</string>
+				<string>{496.57873353282167, 227.18942619211924}</string>
 				<string>{429.06298469487933, 285.29964307344687}</string>
 			</array>
 			<key>Style</key>
@@ -1864,13 +1966,13 @@ Memory}</string>
 		</dict>
 		<dict>
 			<key>Bounds</key>
-			<string>{{460.24407619115618, 213.01619792826426}, {51.023600000000002, 28.346456527709961}}</string>
+			<string>{{465.91336768743304, 213.01619792826426}, {61.33073169077727, 28.346456527709961}}</string>
 			<key>Class</key>
 			<string>ShapedGraphic</string>
 			<key>FontInfo</key>
 			<dict>
 				<key>Font</key>
-				<string>Helvetica</string>
+				<string>Helvetica-Oblique</string>
 				<key>Size</key>
 				<real>8</real>
 			</dict>
@@ -1889,13 +1991,12 @@ Memory}</string>
 			<key>Text</key>
 			<dict>
 				<key>Text</key>
-				<string>{\rtf1\ansi\ansicpg1252\cocoartf1343\cocoasubrtf160
+				<string>{\rtf1\ansi\ansicpg1252\cocoartf1344\cocoasubrtf720
 {\fonttbl\f0\fswiss\fcharset0 Helvetica;}
 {\colortbl;\red255\green255\blue255;}
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc
 
-\f0\fs16 \cf0 USB\
-Host}</string>
+\f0\fs16 \cf0 AuthN/Backup interface}</string>
 				<key>VerticalPad</key>
 				<integer>0</integer>
 			</dict>
@@ -2702,7 +2803,7 @@ Detection}</string>
 				<integer>154</integer>
 			</dict>
 			<key>ID</key>
-			<integer>169</integer>
+			<integer>266</integer>
 			<key>Layer</key>
 			<integer>1</integer>
 			<key>Points</key>
@@ -2732,7 +2833,7 @@ Detection}</string>
 			<key>Tail</key>
 			<dict>
 				<key>ID</key>
-				<integer>168</integer>
+				<integer>265</integer>
 			</dict>
 		</dict>
 		<dict>
@@ -2748,7 +2849,7 @@ Detection}</string>
 				<real>8</real>
 			</dict>
 			<key>ID</key>
-			<integer>168</integer>
+			<integer>265</integer>
 			<key>Layer</key>
 			<integer>1</integer>
 			<key>Style</key>
@@ -2762,13 +2863,13 @@ Detection}</string>
 			<key>Text</key>
 			<dict>
 				<key>Text</key>
-				<string>{\rtf1\ansi\ansicpg1252\cocoartf1343\cocoasubrtf160
+				<string>{\rtf1\ansi\ansicpg1252\cocoartf1344\cocoasubrtf720
 {\fonttbl\f0\fswiss\fcharset0 Helvetica;}
 {\colortbl;\red255\green255\blue255;}
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc
 
-\f0\fs16 \cf0 USB\
-Client}</string>
+\f0\fs16 \cf0 Host\
+interface}</string>
 				<key>VerticalPad</key>
 				<integer>0</integer>
 			</dict>
@@ -2861,7 +2962,7 @@ Client}</string>
 			<key>Text</key>
 			<dict>
 				<key>Text</key>
-				<string>{\rtf1\ansi\ansicpg1252\cocoartf1343\cocoasubrtf160
+				<string>{\rtf1\ansi\ansicpg1252\cocoartf1344\cocoasubrtf720
 {\fonttbl\f0\fswiss\fcharset0 Helvetica;}
 {\colortbl;\red255\green255\blue255;}
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc
@@ -3061,7 +3162,7 @@ Client}</string>
 			<key>Text</key>
 			<dict>
 				<key>Text</key>
-				<string>{\rtf1\ansi\ansicpg1252\cocoartf1343\cocoasubrtf160
+				<string>{\rtf1\ansi\ansicpg1252\cocoartf1344\cocoasubrtf720
 {\fonttbl\f0\fswiss\fcharset0 Helvetica;}
 {\colortbl;\red255\green255\blue255;}
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc
@@ -3110,7 +3211,7 @@ Client}</string>
 			<key>Text</key>
 			<dict>
 				<key>Text</key>
-				<string>{\rtf1\ansi\ansicpg1252\cocoartf1343\cocoasubrtf160
+				<string>{\rtf1\ansi\ansicpg1252\cocoartf1344\cocoasubrtf720
 {\fonttbl\f0\fswiss\fcharset0 Helvetica;}
 {\colortbl;\red255\green255\blue255;}
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc
@@ -3179,7 +3280,7 @@ inputs/outputs}</string>
 		</dict>
 		<dict>
 			<key>Bounds</key>
-			<string>{{194.17323010821974, 198.42519865073541}, {565.51181615459632, 212.59842712578825}}</string>
+			<string>{{194.17323010821974, 197.00787580323029}, {565.51181615459632, 212.59842712578825}}</string>
 			<key>Class</key>
 			<string>ShapedGraphic</string>
 			<key>FontInfo</key>
@@ -3225,7 +3326,7 @@ inputs/outputs}</string>
 				<key>Align</key>
 				<integer>0</integer>
 				<key>Text</key>
-				<string>{\rtf1\ansi\ansicpg1252\cocoartf1343\cocoasubrtf160
+				<string>{\rtf1\ansi\ansicpg1252\cocoartf1344\cocoasubrtf720
 {\fonttbl\f0\fnil\fcharset0 HelveticaNeue;}
 {\colortbl;\red255\green255\blue255;}
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural
@@ -3302,7 +3403,7 @@ inputs/outputs}</string>
 	<key>MasterSheets</key>
 	<array/>
 	<key>ModificationDate</key>
-	<string>2015-01-11 21:23:53 +0000</string>
+	<string>2015-01-28 08:52:41 +0000</string>
 	<key>Modifier</key>
 	<string>Jakob Schlyter</string>
 	<key>NotesVisible</key>
@@ -3330,7 +3431,7 @@ inputs/outputs}</string>
 		<key>NSLeftMargin</key>
 		<array>
 			<string>float</string>
-			<string>12</string>
+			<string>18</string>
 		</array>
 		<key>NSOrientation</key>
 		<array>
@@ -3350,7 +3451,7 @@ inputs/outputs}</string>
 		<key>NSRightMargin</key>
 		<array>
 			<string>float</string>
-			<string>12</string>
+			<string>41</string>
 		</array>
 		<key>NSTopMargin</key>
 		<array>
@@ -3389,21 +3490,21 @@ inputs/outputs}</string>
 		<key>FitInWindow</key>
 		<true/>
 		<key>Frame</key>
-		<string>{{24, 90}, {1656, 937}}</string>
+		<string>{{0, 0}, {1680, 999}}</string>
 		<key>ShowInfo</key>
 		<true/>
 		<key>ShowRuler</key>
 		<true/>
 		<key>Sidebar</key>
-		<true/>
+		<false/>
 		<key>SidebarWidth</key>
-		<integer>200</integer>
+		<integer>0</integer>
 		<key>TopSlabHeight</key>
-		<real>363</real>
+		<real>401</real>
 		<key>VisibleRegion</key>
-		<string>{{0, -3.9999999999999858}, {818, 566.58318739054289}}</string>
+		<string>{{-24, 0}, {831.50489662676807, 559}}</string>
 		<key>Zoom</key>
-		<real>1.3960880195599021</real>
+		<real>1.6440071556350626</real>
 		<key>ZoomValues</key>
 		<array>
 			<array>