diff --git a/Aircraft/Instruments-3d/canvas-test/CMDU.ac b/Aircraft/Instruments-3d/canvas-test/CMDU.ac
new file mode 100644
index 000000000..c7b3ae491
--- /dev/null
+++ b/Aircraft/Instruments-3d/canvas-test/CMDU.ac
@@ -0,0 +1,1341 @@
+AC3Db
+MATERIAL "DefaultWhite" rgb 1.0000 1.0000 1.0000  amb 0.2000 0.2000 0.2000  emis 0.0000 0.0000 0.0000  spec 0.5000 0.5000 0.5000  shi 10 trans 0.0000
+MATERIAL "Plastic-Housing" rgb 0.0081 0.0081 0.0081  amb 1.0000 1.0000 1.0000  emis 0.0000 0.0000 0.0000  spec 1.0000 1.0000 1.0000  shi 50 trans 0.0000
+MATERIAL "Screen" rgb 1.0000 1.0000 1.0000  amb 0.1500 0.1500 0.1500  emis 0.6000 0.6000 0.6000  spec 0.7000 0.75000 0.7000  shi 60 trans 0.0
+OBJECT world
+name "Blender_export__CMDU.ac"
+kids 2
+OBJECT poly
+name "Inclinometer"
+loc 0.0000000 0.0200000 -0.1190000
+numvert 28
+-0.0140000 -0.0000000 0.0000001
+-0.0239999 -0.0000000 0.0050001
+-0.0349999 -0.0000000 -0.0059999
+-0.0139999 0.0050000 0.0000001
+-0.0239999 0.0050000 0.0050001
+-0.0349999 0.0050000 -0.0059999
+-0.0139999 0.0050000 -0.0059999
+-0.0140000 -0.0000000 -0.0059999
+-0.0085829 -0.0000000 0.0005688
+-0.0085829 0.0050000 0.0005689
+-0.0028351 0.0050000 0.0008980
+-0.0028351 -0.0000000 0.0008980
+0.0140000 -0.0000000 0.0000001
+-0.0000000 -0.0000000 0.0050001
+0.0239999 -0.0000000 0.0050001
+0.0349999 -0.0000000 -0.0059999
+0.0139999 0.0050000 0.0000001
+-0.0000000 0.0050000 0.0050001
+0.0239999 0.0050000 0.0050001
+0.0349999 0.0050000 -0.0059999
+0.0139999 0.0050000 -0.0059999
+0.0140000 -0.0000000 -0.0059999
+0.0085829 -0.0000000 0.0005688
+0.0085829 0.0050000 0.0005689
+0.0028351 0.0050000 0.0008980
+0.0028351 -0.0000000 0.0008980
+-0.0000000 -0.0000000 0.0010001
+-0.0000001 0.0050000 0.0010001
+numsurf 24
+SURF 0X20
+mat 1
+refs 4
+13 0.262921 0.498489
+17 0.257850 0.487214
+4 0.214129 0.503787
+1 0.215925 0.514429
+SURF 0X20
+mat 1
+refs 4
+1 0.215925 0.514429
+4 0.214129 0.503787
+5 0.200993 0.497881
+2 0.185360 0.501357
+SURF 0X20
+mat 1
+refs 4
+0 0.221330 0.472064
+7 0.206795 0.472358
+6 0.211065 0.481619
+3 0.223491 0.486236
+SURF 0X20
+mat 1
+refs 4
+2 0.185360 0.501357
+5 0.200993 0.497881
+6 0.211065 0.481619
+7 0.206795 0.472358
+SURF 0X20
+mat 1
+refs 4
+8 0.233199 0.471592
+0 0.221330 0.472064
+3 0.223491 0.486236
+9 0.236925 0.483599
+SURF 0X20
+mat 1
+refs 3
+3 0.223491 0.486236
+6 0.211065 0.481619
+5 0.200993 0.497881
+SURF 0X20
+mat 1
+refs 3
+3 0.223491 0.486236
+5 0.200993 0.497881
+4 0.214129 0.503787
+SURF 0X20
+mat 1
+refs 4
+3 0.223491 0.486236
+4 0.214129 0.503787
+17 0.257850 0.487214
+9 0.236925 0.483599
+SURF 0X20
+mat 1
+refs 4
+9 0.236925 0.483599
+10 0.248566 0.480351
+11 0.244386 0.469329
+8 0.233199 0.471592
+SURF 0X20
+mat 1
+refs 4
+10 0.248566 0.480351
+27 0.253990 0.478807
+26 0.249800 0.467972
+11 0.244386 0.469329
+SURF 0X20
+mat 1
+refs 3
+17 0.257850 0.487214
+10 0.248566 0.480351
+9 0.236925 0.483599
+SURF 0X20
+mat 1
+refs 3
+17 0.257850 0.487214
+27 0.253990 0.478807
+10 0.248566 0.480351
+SURF 0X20
+mat 1
+refs 4
+13 0.262921 0.498489
+14 0.215925 0.514429
+18 0.214129 0.503787
+17 0.257850 0.487214
+SURF 0X20
+mat 1
+refs 4
+14 0.215925 0.514429
+15 0.185360 0.501357
+19 0.200993 0.497881
+18 0.214129 0.503787
+SURF 0X20
+mat 1
+refs 4
+12 0.221330 0.472064
+16 0.223491 0.486236
+20 0.211065 0.481619
+21 0.206795 0.472358
+SURF 0X20
+mat 1
+refs 4
+15 0.185360 0.501357
+21 0.206795 0.472358
+20 0.211065 0.481619
+19 0.200993 0.497881
+SURF 0X20
+mat 1
+refs 4
+22 0.233199 0.471592
+23 0.236925 0.483599
+16 0.223491 0.486236
+12 0.221330 0.472064
+SURF 0X20
+mat 1
+refs 3
+16 0.223491 0.486236
+19 0.200993 0.497881
+20 0.211065 0.481619
+SURF 0X20
+mat 1
+refs 3
+16 0.223491 0.486236
+18 0.214129 0.503787
+19 0.200993 0.497881
+SURF 0X20
+mat 1
+refs 4
+16 0.223491 0.486236
+23 0.236925 0.483599
+17 0.257850 0.487214
+18 0.214129 0.503787
+SURF 0X20
+mat 1
+refs 4
+23 0.236925 0.483599
+22 0.233199 0.471592
+25 0.244386 0.469329
+24 0.248566 0.480351
+SURF 0X20
+mat 1
+refs 4
+24 0.248566 0.480351
+25 0.244386 0.469329
+26 0.249800 0.467972
+27 0.253990 0.478807
+SURF 0X20
+mat 1
+refs 3
+17 0.257850 0.487214
+23 0.236925 0.483599
+24 0.248566 0.480351
+SURF 0X20
+mat 1
+refs 3
+17 0.257850 0.487214
+24 0.248566 0.480351
+27 0.253990 0.478807
+kids 0
+OBJECT poly
+name "PFD"
+loc 0.0000000 0.0000000 0.0000000
+numvert 134
+-0.0760790 0.0160000 0.1252229
+-0.0739190 0.0160000 0.1258017
+-0.0723378 0.0160000 0.1273829
+-0.0717590 0.0160000 0.1295429
+-0.0723378 0.0160000 0.1317029
+-0.0739190 0.0160000 0.1332842
+-0.0760790 0.0160000 0.1338629
+-0.0782390 0.0160000 0.1332842
+-0.0798202 0.0160000 0.1317029
+-0.0803990 0.0160000 0.1295429
+-0.0798202 0.0160000 0.1273829
+-0.0782390 0.0160000 0.1258017
+-0.0782390 0.0210000 0.1258017
+-0.0798202 0.0210000 0.1273829
+-0.0803990 0.0210000 0.1295429
+-0.0798202 0.0210000 0.1317029
+-0.0782390 0.0210000 0.1332842
+-0.0760790 0.0210000 0.1338629
+-0.0739190 0.0210000 0.1332842
+-0.0723378 0.0210000 0.1317029
+-0.0717590 0.0210000 0.1295429
+-0.0723378 0.0210000 0.1273829
+-0.0739190 0.0210000 0.1258017
+-0.0760790 0.0210000 0.1252229
+0.0760800 0.0160000 0.1252200
+0.0782400 0.0160000 0.1257988
+0.0798212 0.0160000 0.1273800
+0.0804000 0.0160000 0.1295400
+0.0798212 0.0160000 0.1317000
+0.0782400 0.0160000 0.1332812
+0.0760800 0.0160000 0.1338600
+0.0739200 0.0160000 0.1332812
+0.0723388 0.0160000 0.1317000
+0.0717600 0.0160000 0.1295400
+0.0723388 0.0160000 0.1273800
+0.0739200 0.0160000 0.1257988
+0.0739200 0.0210000 0.1257988
+0.0723388 0.0210000 0.1273800
+0.0717600 0.0210000 0.1295400
+0.0723388 0.0210000 0.1317000
+0.0739200 0.0210000 0.1332812
+0.0760800 0.0210000 0.1338600
+0.0782400 0.0210000 0.1332812
+0.0798212 0.0210000 0.1317000
+0.0804000 0.0210000 0.1295400
+0.0798212 0.0210000 0.1273800
+0.0782400 0.0210000 0.1257988
+0.0760800 0.0210000 0.1252200
+0.0340000 0.0160000 -0.1260000
+-0.0350000 0.0160000 -0.1260000
+0.0361213 0.0160000 -0.1251213
+-0.0371213 0.0160000 -0.1251213
+0.0370000 0.0160000 -0.1230000
+-0.0380000 0.0160000 -0.1230000
+0.0370000 0.0160000 -0.1150000
+-0.0380000 0.0160000 -0.1150000
+0.0361213 0.0160000 -0.1128787
+-0.0371213 0.0160000 -0.1128787
+0.0340000 0.0160000 -0.1120000
+-0.0350000 0.0160000 -0.1120000
+0.0340000 0.0200000 -0.1120000
+-0.0350000 0.0200000 -0.1120000
+0.0361213 0.0200000 -0.1128787
+-0.0371213 0.0200000 -0.1128787
+0.0370000 0.0200000 -0.1150000
+-0.0380000 0.0200000 -0.1150000
+0.0370000 0.0200000 -0.1230000
+-0.0380000 0.0200000 -0.1230000
+0.0361213 0.0200000 -0.1251213
+-0.0371213 0.0200000 -0.1251213
+0.0340000 0.0200000 -0.1260000
+-0.0350000 0.0200000 -0.1260000
+0.1000000 0.0000000 -0.1260000
+-0.1000000 -0.0000000 -0.1260000
+0.1000000 0.0160000 -0.1259999
+-0.1000000 0.0160000 -0.1260000
+-0.0900000 0.0000000 0.1370000
+-0.1000000 0.0000000 0.1210000
+-0.0900000 0.0160000 0.1370000
+-0.1000000 0.0160000 0.1210000
+0.1000000 0.0160000 0.1210000
+0.0900000 0.0160000 0.1370000
+0.0900000 0.0000000 0.1370000
+0.1000000 0.0000000 0.1210000
+0.0560000 0.0000000 -0.1260000
+0.0970000 0.0000000 -0.1260000
+0.0900000 0.0000000 -0.1370000
+0.0630000 0.0000000 -0.1370000
+-0.0900000 0.0000000 -0.1370000
+-0.0630000 0.0000000 -0.1370000
+-0.0560000 0.0000000 -0.1260000
+-0.0970000 0.0000000 -0.1260000
+-0.0970000 0.0060000 -0.1260000
+-0.0560000 0.0060000 -0.1260000
+-0.0630000 0.0060000 -0.1370000
+-0.0900000 0.0060000 -0.1370000
+0.0630000 0.0060000 -0.1370000
+0.0900000 0.0060000 -0.1370000
+0.0970000 0.0060000 -0.1260000
+0.0560000 0.0060000 -0.1260000
+-0.0760001 0.0120000 0.1059999
+-0.0788285 0.0120000 0.1048284
+-0.0800001 0.0120000 0.1020000
+-0.0760000 0.0160000 0.1080000
+-0.0802426 0.0160000 0.1062426
+-0.0820000 0.0160000 0.1020000
+0.0760000 0.0160000 0.1079999
+0.0802426 0.0160000 0.1062426
+0.0820000 0.0160000 0.1019999
+0.0759999 0.0120000 0.1060000
+0.0788283 0.0120000 0.1048284
+0.0799999 0.0120000 0.1020000
+-0.0800000 0.0120000 -0.1020000
+-0.0788285 0.0120000 -0.1048285
+-0.0760000 0.0120000 -0.1060000
+-0.0820001 0.0160000 -0.1020000
+-0.0802427 0.0160000 -0.1062426
+-0.0760001 0.0160000 -0.1080000
+0.0819999 0.0160000 -0.1020000
+0.0802425 0.0160000 -0.1062426
+0.0759999 0.0160000 -0.1080000
+0.0800000 0.0120000 -0.1020000
+0.0788284 0.0120000 -0.1048284
+0.0760000 0.0120000 -0.1059999
+-0.0970000 0.0160000 0.0400000
+-0.0880000 0.0160000 0.0400000
+-0.0880000 0.0160000 0.0200000
+-0.0970000 0.0160000 0.0200000
+-0.0970000 0.0187644 0.0204886
+-0.0880000 0.0187644 0.0204886
+-0.0880000 0.0187644 0.0395000
+-0.0970000 0.0187644 0.0395000
+-0.0970000 0.0174356 0.0300000
+-0.0880000 0.0174356 0.0300000
+numsurf 141
+SURF 0X30
+mat 1
+refs 4
+23 0.241956 0.522704
+0 0.242755 0.521451
+11 0.243890 0.522330
+12 0.242454 0.523073
+SURF 0X30
+mat 1
+refs 4
+10 0.244387 0.523538
+13 0.242660 0.523583
+12 0.242454 0.523073
+11 0.243890 0.522330
+SURF 0X30
+mat 1
+refs 4
+10 0.244387 0.523538
+9 0.243975 0.524773
+14 0.242497 0.524098
+13 0.242660 0.523583
+SURF 0X30
+mat 1
+refs 4
+8 0.242897 0.525710
+15 0.242018 0.524489
+14 0.242497 0.524098
+9 0.243975 0.524773
+SURF 0X30
+mat 1
+refs 4
+7 0.241387 0.526062
+16 0.241361 0.524639
+15 0.242018 0.524489
+8 0.242897 0.525710
+SURF 0X30
+mat 1
+refs 4
+7 0.241387 0.526062
+6 0.239856 0.525715
+17 0.240701 0.524509
+16 0.241361 0.524639
+SURF 0X30
+mat 1
+refs 4
+6 0.239856 0.525715
+5 0.238807 0.524868
+18 0.240219 0.524143
+17 0.240701 0.524509
+SURF 0X30
+mat 1
+refs 4
+5 0.238807 0.524868
+4 0.238390 0.523673
+19 0.240028 0.523636
+18 0.240219 0.524143
+SURF 0X30
+mat 1
+refs 4
+3 0.238723 0.522463
+20 0.240177 0.523125
+19 0.240028 0.523636
+4 0.238390 0.523673
+SURF 0X30
+mat 1
+refs 4
+3 0.238723 0.522463
+2 0.239703 0.521574
+21 0.240637 0.522741
+20 0.240177 0.523125
+SURF 0X30
+mat 1
+refs 4
+2 0.239703 0.521574
+1 0.241227 0.521163
+22 0.241292 0.522582
+21 0.240637 0.522741
+SURF 0X30
+mat 1
+refs 4
+0 0.242755 0.521451
+23 0.241956 0.522704
+22 0.241292 0.522582
+1 0.241227 0.521163
+SURF 0X20
+mat 1
+refs 4
+17 0.240701 0.524509
+18 0.240219 0.524143
+22 0.241292 0.522582
+23 0.241956 0.522704
+SURF 0X20
+mat 1
+refs 4
+18 0.240219 0.524143
+19 0.240028 0.523636
+21 0.240637 0.522741
+22 0.241292 0.522582
+SURF 0X20
+mat 1
+refs 3
+19 0.240028 0.523636
+20 0.240177 0.523125
+21 0.240637 0.522741
+SURF 0X20
+mat 1
+refs 4
+12 0.242454 0.523073
+16 0.241361 0.524639
+17 0.240701 0.524509
+23 0.241956 0.522704
+SURF 0X20
+mat 1
+refs 4
+12 0.242454 0.523073
+13 0.242660 0.523583
+15 0.242018 0.524489
+16 0.241361 0.524639
+SURF 0X20
+mat 1
+refs 3
+13 0.242660 0.523583
+14 0.242497 0.524098
+15 0.242018 0.524489
+SURF 0X30
+mat 1
+refs 4
+47 0.158797 0.481680
+24 0.159953 0.480045
+35 0.161445 0.481110
+36 0.159445 0.482113
+SURF 0X30
+mat 1
+refs 4
+34 0.162195 0.482526
+37 0.159662 0.482720
+36 0.159445 0.482113
+35 0.161445 0.481110
+SURF 0X30
+mat 1
+refs 4
+34 0.162195 0.482526
+33 0.161280 0.484319
+38 0.159293 0.483404
+37 0.159662 0.482720
+SURF 0X30
+mat 1
+refs 4
+32 0.159602 0.485603
+39 0.158508 0.483973
+38 0.159293 0.483404
+33 0.161280 0.484319
+SURF 0X30
+mat 1
+refs 4
+31 0.157446 0.486144
+40 0.157534 0.484238
+39 0.158508 0.483973
+32 0.159602 0.485603
+SURF 0X30
+mat 1
+refs 4
+31 0.157446 0.486144
+30 0.155191 0.485826
+41 0.156612 0.484134
+40 0.157534 0.484238
+SURF 0X30
+mat 1
+refs 4
+30 0.155191 0.485826
+29 0.154033 0.484685
+42 0.156026 0.483690
+41 0.156612 0.484134
+SURF 0X30
+mat 1
+refs 4
+29 0.154033 0.484685
+28 0.153620 0.483088
+43 0.155873 0.483044
+42 0.156026 0.483690
+SURF 0X30
+mat 1
+refs 4
+27 0.154265 0.481433
+44 0.156207 0.482365
+43 0.155873 0.483044
+28 0.153620 0.483088
+SURF 0X30
+mat 1
+refs 4
+27 0.154265 0.481433
+26 0.155846 0.480275
+45 0.156948 0.481823
+44 0.156207 0.482365
+SURF 0X30
+mat 1
+refs 4
+26 0.155846 0.480275
+25 0.157920 0.479695
+46 0.157890 0.481566
+45 0.156948 0.481823
+SURF 0X30
+mat 1
+refs 4
+24 0.159953 0.480045
+47 0.158797 0.481680
+46 0.157890 0.481566
+25 0.157920 0.479695
+SURF 0X20
+mat 1
+refs 4
+41 0.156612 0.484134
+42 0.156026 0.483690
+46 0.157890 0.481566
+47 0.158797 0.481680
+SURF 0X20
+mat 1
+refs 4
+42 0.156026 0.483690
+43 0.155873 0.483044
+45 0.156948 0.481823
+46 0.157890 0.481566
+SURF 0X20
+mat 1
+refs 3
+43 0.155873 0.483044
+44 0.156207 0.482365
+45 0.156948 0.481823
+SURF 0X20
+mat 1
+refs 4
+36 0.159445 0.482113
+40 0.157534 0.484238
+41 0.156612 0.484134
+47 0.158797 0.481680
+SURF 0X20
+mat 1
+refs 4
+36 0.159445 0.482113
+37 0.159662 0.482720
+39 0.158508 0.483973
+40 0.157534 0.484238
+SURF 0X20
+mat 1
+refs 3
+37 0.159662 0.482720
+38 0.159293 0.483404
+39 0.158508 0.483973
+SURF 0X20
+mat 1
+refs 4
+54 0.266953 0.381552
+52 0.268091 0.379187
+66 0.269626 0.379620
+64 0.268445 0.381712
+SURF 0X20
+mat 1
+refs 4
+67 0.286253 0.387127
+53 0.289671 0.385809
+55 0.290001 0.392701
+65 0.287405 0.392087
+SURF 0X30
+mat 1
+refs 4
+58 0.267889 0.383268
+56 0.267159 0.382471
+62 0.268379 0.382083
+60 0.268633 0.382367
+SURF 0X30
+mat 1
+refs 4
+63 0.287643 0.392722
+57 0.290697 0.394636
+59 0.291038 0.396409
+61 0.287043 0.392903
+SURF 0X30
+mat 1
+refs 4
+56 0.267159 0.382471
+54 0.266953 0.381552
+64 0.268445 0.381712
+62 0.268379 0.382083
+SURF 0X30
+mat 1
+refs 4
+65 0.287405 0.392087
+55 0.290001 0.392701
+57 0.290697 0.394636
+63 0.287643 0.392722
+SURF 0X30
+mat 1
+refs 4
+52 0.268091 0.379187
+50 0.269402 0.377641
+68 0.270146 0.379042
+66 0.269626 0.379620
+SURF 0X30
+mat 1
+refs 4
+69 0.285470 0.386300
+51 0.286474 0.383186
+53 0.289671 0.385809
+67 0.286253 0.387127
+SURF 0X30
+mat 1
+refs 4
+50 0.269402 0.377641
+48 0.271134 0.376506
+70 0.270724 0.378764
+68 0.270146 0.379042
+SURF 0X30
+mat 1
+refs 4
+71 0.284473 0.386142
+49 0.281499 0.381597
+51 0.286474 0.383186
+69 0.285470 0.386300
+SURF 0X20
+mat 1
+refs 4
+48 0.271134 0.376506
+49 0.281499 0.381597
+71 0.284473 0.386142
+70 0.270724 0.378764
+SURF 0X20
+mat 1
+refs 4
+58 0.267889 0.383268
+60 0.268633 0.382367
+61 0.287043 0.392903
+59 0.291038 0.396409
+SURF 0X20
+mat 1
+refs 4
+60 0.268633 0.382367
+70 0.270724 0.378764
+71 0.284473 0.386142
+61 0.287043 0.392903
+SURF 0X20
+mat 1
+refs 4
+60 0.268633 0.382367
+62 0.268379 0.382083
+68 0.270146 0.379042
+70 0.270724 0.378764
+SURF 0X20
+mat 1
+refs 4
+61 0.287043 0.392903
+71 0.284473 0.386142
+69 0.285470 0.386300
+63 0.287643 0.392722
+SURF 0X20
+mat 1
+refs 4
+65 0.287405 0.392087
+63 0.287643 0.392722
+69 0.285470 0.386300
+67 0.286253 0.387127
+SURF 0X20
+mat 1
+refs 4
+64 0.268445 0.381712
+66 0.269626 0.379620
+68 0.270146 0.379042
+62 0.268379 0.382083
+SURF 0X20
+mat 1
+refs 4
+79 0.255280 0.527079
+75 0.343252 0.410062
+73 0.350984 0.412882
+77 0.260923 0.533811
+SURF 0X20
+mat 1
+refs 4
+76 0.246032 0.538120
+78 0.246630 0.530117
+79 0.255280 0.527079
+77 0.260923 0.533811
+SURF 0X20
+mat 1
+refs 4
+81 0.144951 0.483384
+82 0.133528 0.488875
+83 0.133879 0.468705
+80 0.145351 0.470831
+SURF 0X20
+mat 1
+refs 4
+76 0.246032 0.538120
+82 0.133528 0.488875
+81 0.144951 0.483384
+78 0.246630 0.530117
+SURF 0X20
+mat 1
+refs 4
+72 0.257365 0.360220
+74 0.263170 0.367629
+80 0.145351 0.470831
+83 0.133879 0.468705
+SURF 0X20
+mat 1
+refs 4
+88 0.350057 0.402183
+91 0.351122 0.409748
+92 0.346758 0.408962
+95 0.347375 0.403292
+SURF 0X20
+mat 1
+refs 4
+89 0.338326 0.393811
+88 0.350057 0.402183
+95 0.347375 0.403292
+94 0.337347 0.395902
+SURF 0X20
+mat 1
+refs 4
+90 0.331819 0.394085
+89 0.338326 0.393811
+94 0.337347 0.395902
+93 0.330956 0.396478
+SURF 0X20
+mat 1
+refs 4
+85 0.260317 0.358409
+86 0.270633 0.353457
+97 0.271190 0.356997
+98 0.263701 0.362216
+SURF 0X20
+mat 1
+refs 4
+86 0.270633 0.353457
+87 0.291978 0.358738
+96 0.289578 0.360308
+97 0.271190 0.356997
+SURF 0X20
+mat 1
+refs 4
+87 0.291978 0.358738
+84 0.291931 0.368562
+99 0.288366 0.369916
+96 0.289578 0.360308
+SURF 0X20
+mat 1
+refs 4
+96 0.289578 0.360308
+99 0.288366 0.369916
+98 0.263701 0.362216
+97 0.271190 0.356997
+SURF 0X20
+mat 1
+refs 4
+95 0.347375 0.403292
+92 0.346758 0.408962
+93 0.330956 0.396478
+94 0.337347 0.395902
+SURF 0X20
+mat 1
+refs 4
+72 0.257365 0.360220
+85 0.260317 0.358409
+98 0.263701 0.362216
+74 0.263170 0.367629
+SURF 0X20
+mat 1
+refs 4
+74 0.263170 0.367629
+98 0.263701 0.362216
+99 0.288366 0.369916
+75 0.343252 0.410062
+SURF 0X20
+mat 1
+refs 4
+75 0.343252 0.410062
+99 0.288366 0.369916
+93 0.330956 0.396478
+92 0.346758 0.408962
+SURF 0X20
+mat 1
+refs 4
+84 0.291931 0.368562
+90 0.331819 0.394085
+93 0.330956 0.396478
+99 0.288366 0.369916
+SURF 0X20
+mat 1
+refs 4
+73 0.350984 0.412882
+75 0.343252 0.410062
+92 0.346758 0.408962
+91 0.351122 0.409748
+SURF 0X30
+mat 1
+refs 4
+101 0.250030 0.512374
+102 0.251214 0.511551
+105 0.253053 0.513005
+104 0.250674 0.514592
+SURF 0X30
+mat 1
+refs 4
+100 0.248623 0.512080
+101 0.250030 0.512374
+104 0.250674 0.514592
+103 0.247769 0.514233
+SURF 0X30
+mat 1
+refs 4
+111 0.167921 0.466847
+110 0.168489 0.467590
+107 0.165209 0.469242
+108 0.164870 0.466828
+SURF 0X30
+mat 1
+refs 4
+110 0.168489 0.467590
+109 0.170987 0.468185
+106 0.167593 0.471513
+107 0.165209 0.469242
+SURF 0X30
+mat 1
+refs 4
+113 0.320042 0.417471
+114 0.318702 0.417785
+117 0.316273 0.412751
+116 0.321259 0.414805
+SURF 0X30
+mat 1
+refs 4
+112 0.320324 0.417945
+113 0.320042 0.417471
+116 0.321259 0.414805
+115 0.322844 0.417520
+SURF 0X30
+mat 1
+refs 4
+123 0.251117 0.376367
+122 0.253350 0.376630
+119 0.254226 0.376665
+120 0.254562 0.375808
+SURF 0X30
+mat 1
+refs 4
+122 0.253350 0.376630
+121 0.254387 0.378302
+118 0.254605 0.378813
+119 0.254226 0.376665
+SURF 0X30
+mat 1
+refs 4
+102 0.251214 0.511551
+112 0.320324 0.417945
+115 0.322844 0.417520
+105 0.253053 0.513005
+SURF 0X30
+mat 1
+refs 4
+114 0.318702 0.417785
+123 0.251117 0.376367
+120 0.254562 0.375808
+117 0.316273 0.412751
+SURF 0X30
+mat 1
+refs 4
+108 0.164870 0.466828
+118 0.254605 0.378813
+121 0.254387 0.378302
+111 0.167921 0.466847
+SURF 0X30
+mat 1
+refs 4
+100 0.248623 0.512080
+103 0.247769 0.514233
+106 0.167593 0.471513
+109 0.170987 0.468185
+SURF 0X20
+mat 1
+refs 4
+75 0.343252 0.410062
+79 0.255280 0.527079
+124 0.282633 0.488285
+127 0.289400 0.479049
+SURF 0X20
+mat 1
+refs 4
+126 0.284417 0.476418
+127 0.289400 0.479049
+128 0.288202 0.479496
+129 0.284488 0.477510
+SURF 0X20
+mat 1
+refs 4
+124 0.282633 0.488285
+125 0.277744 0.485543
+130 0.278924 0.485120
+131 0.282590 0.487164
+SURF 0X20
+mat 1
+refs 3
+132 0.285589 0.483443
+127 0.289400 0.479049
+124 0.282633 0.488285
+SURF 0X20
+mat 1
+refs 3
+131 0.282590 0.487164
+132 0.285589 0.483443
+124 0.282633 0.488285
+SURF 0X20
+mat 1
+refs 3
+132 0.285589 0.483443
+128 0.288202 0.479496
+127 0.289400 0.479049
+SURF 0X20
+mat 1
+refs 3
+133 0.281529 0.481217
+125 0.277744 0.485543
+126 0.284417 0.476418
+SURF 0X20
+mat 1
+refs 3
+129 0.284488 0.477510
+133 0.281529 0.481217
+126 0.284417 0.476418
+SURF 0X20
+mat 1
+refs 3
+133 0.281529 0.481217
+130 0.278924 0.485120
+125 0.277744 0.485543
+SURF 0X20
+mat 1
+refs 4
+130 0.278924 0.485120
+133 0.281529 0.481217
+132 0.285589 0.483443
+131 0.282590 0.487164
+SURF 0X20
+mat 1
+refs 4
+128 0.288202 0.479496
+132 0.285589 0.483443
+133 0.281529 0.481217
+129 0.284488 0.477510
+SURF 0X20
+mat 1
+refs 4
+58 0.267889 0.383268
+59 0.291038 0.396409
+117 0.316273 0.412751
+120 0.254562 0.375808
+SURF 0X20
+mat 1
+refs 3
+57 0.290697 0.394636
+117 0.316273 0.412751
+59 0.291038 0.396409
+SURF 0X20
+mat 1
+refs 3
+51 0.286474 0.383186
+75 0.343252 0.410062
+53 0.289671 0.385809
+SURF 0X20
+mat 1
+refs 3
+49 0.281499 0.381597
+75 0.343252 0.410062
+51 0.286474 0.383186
+SURF 0X20
+mat 1
+refs 3
+50 0.269402 0.377641
+52 0.268091 0.379187
+74 0.263170 0.367629
+SURF 0X20
+mat 1
+refs 3
+48 0.271134 0.376506
+50 0.269402 0.377641
+74 0.263170 0.367629
+SURF 0X20
+mat 1
+refs 3
+56 0.267159 0.382471
+58 0.267889 0.383268
+120 0.254562 0.375808
+SURF 0X20
+mat 1
+refs 3
+75 0.343252 0.410062
+116 0.321259 0.414805
+117 0.316273 0.412751
+SURF 0X20
+mat 1
+refs 3
+75 0.343252 0.410062
+115 0.322844 0.417520
+116 0.321259 0.414805
+SURF 0X20
+mat 1
+refs 4
+53 0.289671 0.385809
+75 0.343252 0.410062
+117 0.316273 0.412751
+55 0.290001 0.392701
+SURF 0X20
+mat 1
+refs 3
+55 0.290001 0.392701
+117 0.316273 0.412751
+57 0.290697 0.394636
+SURF 0X20
+mat 1
+refs 4
+75 0.343252 0.410062
+127 0.289400 0.479049
+126 0.284417 0.476418
+115 0.322844 0.417520
+SURF 0X20
+mat 1
+refs 4
+105 0.253053 0.513005
+115 0.322844 0.417520
+126 0.284417 0.476418
+125 0.277744 0.485543
+SURF 0X20
+mat 1
+refs 4
+79 0.255280 0.527079
+105 0.253053 0.513005
+125 0.277744 0.485543
+124 0.282633 0.488285
+SURF 0X20
+mat 1
+refs 4
+78 0.246630 0.530117
+104 0.250674 0.514592
+105 0.253053 0.513005
+79 0.255280 0.527079
+SURF 0X20
+mat 1
+refs 3
+78 0.246630 0.530117
+103 0.247769 0.514233
+104 0.250674 0.514592
+SURF 0X20
+mat 1
+refs 4
+80 0.145351 0.470831
+107 0.165209 0.469242
+106 0.167593 0.471513
+81 0.144951 0.483384
+SURF 0X20
+mat 1
+refs 3
+80 0.145351 0.470831
+108 0.164870 0.466828
+107 0.165209 0.469242
+SURF 0X20
+mat 1
+refs 4
+74 0.263170 0.367629
+118 0.254605 0.378813
+108 0.164870 0.466828
+80 0.145351 0.470831
+SURF 0X20
+mat 1
+refs 3
+74 0.263170 0.367629
+119 0.254226 0.376665
+118 0.254605 0.378813
+SURF 0X20
+mat 1
+refs 3
+74 0.263170 0.367629
+120 0.254562 0.375808
+119 0.254226 0.376665
+SURF 0X20
+mat 1
+refs 3
+54 0.266953 0.381552
+56 0.267159 0.382471
+120 0.254562 0.375808
+SURF 0X20
+mat 1
+refs 4
+52 0.268091 0.379187
+54 0.266953 0.381552
+120 0.254562 0.375808
+74 0.263170 0.367629
+SURF 0X20
+mat 1
+refs 4
+3 0.238723 0.522463
+4 0.238390 0.523673
+32 0.159602 0.485603
+33 0.161280 0.484319
+SURF 0X20
+mat 1
+refs 4
+2 0.239703 0.521574
+3 0.238723 0.522463
+33 0.161280 0.484319
+34 0.162195 0.482526
+SURF 0X20
+mat 1
+refs 4
+4 0.238390 0.523673
+5 0.238807 0.524868
+31 0.157446 0.486144
+32 0.159602 0.485603
+SURF 0X20
+mat 1
+refs 4
+5 0.238807 0.524868
+6 0.239856 0.525715
+30 0.155191 0.485826
+31 0.157446 0.486144
+SURF 0X20
+mat 1
+refs 4
+6 0.239856 0.525715
+78 0.246630 0.530117
+81 0.144951 0.483384
+30 0.155191 0.485826
+SURF 0X20
+mat 1
+refs 3
+29 0.154033 0.484685
+30 0.155191 0.485826
+81 0.144951 0.483384
+SURF 0X20
+mat 1
+refs 3
+28 0.153620 0.483088
+29 0.154033 0.484685
+81 0.144951 0.483384
+SURF 0X20
+mat 1
+refs 3
+27 0.154265 0.481433
+28 0.153620 0.483088
+81 0.144951 0.483384
+SURF 0X20
+mat 1
+refs 3
+26 0.155846 0.480275
+27 0.154265 0.481433
+81 0.144951 0.483384
+SURF 0X20
+mat 1
+refs 3
+26 0.155846 0.480275
+81 0.144951 0.483384
+106 0.167593 0.471513
+SURF 0X20
+mat 1
+refs 3
+25 0.157920 0.479695
+26 0.155846 0.480275
+106 0.167593 0.471513
+SURF 0X20
+mat 1
+refs 3
+24 0.159953 0.480045
+25 0.157920 0.479695
+106 0.167593 0.471513
+SURF 0X20
+mat 1
+refs 3
+24 0.159953 0.480045
+106 0.167593 0.471513
+35 0.161445 0.481110
+SURF 0X20
+mat 1
+refs 3
+34 0.162195 0.482526
+35 0.161445 0.481110
+106 0.167593 0.471513
+SURF 0X20
+mat 1
+refs 4
+2 0.239703 0.521574
+34 0.162195 0.482526
+106 0.167593 0.471513
+103 0.247769 0.514233
+SURF 0X20
+mat 1
+refs 3
+1 0.241227 0.521163
+2 0.239703 0.521574
+103 0.247769 0.514233
+SURF 0X20
+mat 1
+refs 3
+0 0.242755 0.521451
+1 0.241227 0.521163
+103 0.247769 0.514233
+SURF 0X20
+mat 1
+refs 3
+0 0.242755 0.521451
+103 0.247769 0.514233
+11 0.243890 0.522330
+SURF 0X20
+mat 1
+refs 3
+10 0.244387 0.523538
+11 0.243890 0.522330
+103 0.247769 0.514233
+SURF 0X20
+mat 1
+refs 3
+6 0.239856 0.525715
+7 0.241387 0.526062
+78 0.246630 0.530117
+SURF 0X20
+mat 1
+refs 3
+7 0.241387 0.526062
+8 0.242897 0.525710
+78 0.246630 0.530117
+SURF 0X20
+mat 1
+refs 3
+8 0.242897 0.525710
+9 0.243975 0.524773
+78 0.246630 0.530117
+SURF 0X20
+mat 1
+refs 3
+9 0.243975 0.524773
+10 0.244387 0.523538
+78 0.246630 0.530117
+SURF 0X20
+mat 1
+refs 3
+10 0.244387 0.523538
+103 0.247769 0.514233
+78 0.246630 0.530117
+kids 1
+OBJECT poly
+name "PFD-Screen"
+loc 0.0000000 0.0000000 0.0000000
+texture "screen-test.png"
+texrep 1 1
+numvert 12
+-0.0760001 0.0120000 0.1059999
+-0.0788285 0.0120000 0.1048284
+-0.0800001 0.0120000 0.1020000
+0.0759999 0.0120000 0.1060000
+0.0788283 0.0120000 0.1048284
+0.0799999 0.0120000 0.1020000
+-0.0800000 0.0120000 -0.1020000
+-0.0788285 0.0120000 -0.1048285
+-0.0760000 0.0120000 -0.1060000
+0.0800000 0.0120000 -0.1020000
+0.0788284 0.0120000 -0.1048284
+0.0760000 0.0120000 -0.1059999
+numsurf 5
+SURF 0X20
+mat 2
+refs 4
+0 0.025017 -0.000045
+3 0.975009 -0.000045
+11 0.975009 1.000334
+8 0.025018 1.000335
+SURF 0X20
+mat 2
+refs 4
+3 0.975009 -0.000045
+4 0.992686 0.005483
+10 0.992687 0.994806
+11 0.975009 1.000334
+SURF 0X20
+mat 2
+refs 4
+4 0.992686 0.005483
+5 1.000009 0.018830
+9 1.000009 0.981460
+10 0.992687 0.994806
+SURF 0X20
+mat 2
+refs 4
+0 0.025017 -0.000045
+8 0.025018 1.000335
+7 0.007340 0.994806
+1 0.007340 0.005484
+SURF 0X20
+mat 2
+refs 4
+1 0.007340 0.005484
+7 0.007340 0.994806
+6 0.000018 0.981460
+2 0.000018 0.018830
+kids 0
diff --git a/Aircraft/Instruments-3d/canvas-test/canvas-test.nas b/Aircraft/Instruments-3d/canvas-test/canvas-test.nas
new file mode 100644
index 000000000..679d3c194
--- /dev/null
+++ b/Aircraft/Instruments-3d/canvas-test/canvas-test.nas
@@ -0,0 +1,99 @@
+# ==============================================================================
+# DEMO
+# ==============================================================================
+var canvas_demo = {
+  new: func()
+  {
+    debug.dump("Creating new canvas demo...");
+
+    var m = { parents: [canvas_demo] };
+    
+    # create a new canvas...
+    m.canvas = canvas.new({
+      "name": "PFD-Test",
+      "size": [1024, 1024],
+      "view": [768, 1024],
+      "mipmapping": 1
+    });
+    
+    # ... and place it on the object called PFD-Screen
+    m.canvas.addPlacement({"node": "PFD-Screen"});
+    m.canvas.setColorBackground(0,0.04,0);
+    
+    # and now do something with it
+    m.dt = props.globals.getNode("sim/time/delta-sec");
+    m.gmt  = props.globals.getNode("sim/time/gmt");
+    
+    var g = m.canvas.createGroup();
+    var g_tf = g.createTransform();
+    g_tf.setRotation(0.1 * math.pi);
+    
+    m.text_title =
+      g.createChild("text", "line-title")
+       .setDrawMode(canvas.Text.TEXT + canvas.Text.FILLEDBOUNDINGBOX)
+       .setColor(0,0,0)
+       .setColorFill(0,1,0)
+       .setAlignment("center-top")
+       .setFont("LiberationFonts/LiberationMono-Bold.ttf")
+       .setFontSize(70, 1.5)
+       .setTranslation(384, 5);
+
+    m.dynamic_text =
+      g.createChild("text", "dynamic-text")
+       .setText("Text node created at runtime.")
+       .setFont("Helvetica.txf")
+       .setFontSize(50)
+       .setAlignment("center-center");
+    m.tf = m.dynamic_text.createTransform();
+    m.tf.setTranslation(384, 200);
+
+    m.path =
+      g.createChild("path")
+       .moveTo(25, 12.5)
+       .lineTo(325, 25)
+       .lineTo(150, 200)
+       .cubicTo(150, 225, 50, 225, 50, 200)
+       .close()
+       .setTranslation(200, 70)
+       .setStrokeLineWidth(4)
+       .setStrokeDashArray([10,6,3,3,6])
+       .setColor(0.2,0.3,1);
+
+    m.rot = 0;
+    m.pos = 200;
+    m.move = 50;
+    
+    return m;
+  },
+  update: func()
+  {
+    var dt = me.dt.getValue();
+
+    # Change the value of a text element    
+    me.text_title.setText(me.gmt.getValue());
+    
+    # Animate a text node a bit
+    me.rot += dt * 0.3 * math.pi;
+    me.tf.setRotation(me.rot);
+    
+    me.pos += me.move * dt;
+    if( me.pos > 900 )
+    {
+      me.pos = 900;
+      me.move *= -1;
+    }
+    else if( me.pos < 150 )
+    {
+      me.pos = 150;
+      me.move *= -1;
+    }
+    me.tf.setTranslation(384, me.pos);
+
+    settimer(func me.update(), 0);
+  },
+};
+
+setlistener("/nasal/canvas/loaded", func {
+  var demo = canvas_demo.new();
+  demo.update();
+}, 1);
diff --git a/Aircraft/Instruments-3d/canvas-test/screen-test.png b/Aircraft/Instruments-3d/canvas-test/screen-test.png
new file mode 100644
index 000000000..159304c1c
Binary files /dev/null and b/Aircraft/Instruments-3d/canvas-test/screen-test.png differ
diff --git a/Aircraft/c172p/Models/c172p-canvas.xml b/Aircraft/c172p/Models/c172p-canvas.xml
new file mode 100644
index 000000000..4ec834ae7
--- /dev/null
+++ b/Aircraft/c172p/Models/c172p-canvas.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+
+<PropertyList>
+
+ <model>
+  <path>canvas-test.xml</path>
+ </model>
+
+ <model>
+   <path>Aircraft/c172p/Models/c172p.xml</path>
+   <offsets>
+     <x-m> 0.0 </x-m>
+     <y-m> 0.0 </y-m>
+     <z-m> 0.0 </z-m>
+     <roll-deg>    0.0 </roll-deg>
+     <pitch-deg>   0.0 </pitch-deg>
+     <heading-deg> 0.0 </heading-deg>
+   </offsets>
+ </model>
+</PropertyList>
diff --git a/Aircraft/c172p/Models/canvas-test.xml b/Aircraft/c172p/Models/canvas-test.xml
new file mode 100644
index 000000000..cb3fc48dd
--- /dev/null
+++ b/Aircraft/c172p/Models/canvas-test.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+
+<PropertyList>
+
+ <path>Aircraft/Instruments-3d/canvas-test/CMDU.ac</path>
+ <offsets>
+   <heading-deg>90</heading-deg>
+   <roll-deg>75</roll-deg>
+   <pitch-deg>0</pitch-deg>
+   <x-m>-0.15 </x-m>
+   <y-m>-0.21 </y-m>
+   <z-m>-0.2 </z-m>
+ </offsets>
+</PropertyList>
diff --git a/Aircraft/c172p/c172p-canvas-set.xml b/Aircraft/c172p/c172p-canvas-set.xml
new file mode 100644
index 000000000..6f44361a4
--- /dev/null
+++ b/Aircraft/c172p/c172p-canvas-set.xml
@@ -0,0 +1,346 @@
+<?xml version="1.0"?>
+<!--
+************************************************************************
+JSBSim Cessna 172P with 3D cockpit.
+
+Started October 23 2001 by John Check, fgpanels@rockfish.net
+************************************************************************
+-->
+
+<PropertyList>
+
+ <sim>
+
+  <description>Cessna 172P - Canvas Demo</description>
+  <author>David Megginson</author>
+  <status>early production</status>
+  <rating>
+    <FDM type="int">3</FDM>
+    <systems type="int">4</systems>
+    <model type="int">5</model>
+    <cockpit type="int">4</cockpit>
+  </rating>
+
+
+  <flight-model archive="y">jsb</flight-model>
+  <aero archive="y">c172p</aero>
+
+  <allow-toggle-cockpit type="bool">true</allow-toggle-cockpit>
+  <model>
+    <path archive="y">Aircraft/c172p/Models/c172p-canvas.xml</path>
+
+    <livery>
+      <file type="string">n301dp</file>
+      <index type="int">0</index>
+    </livery>
+
+    <liverytail>
+      <file type="string">n301dp</file>
+      <index type="int">0</index>
+    </liverytail>
+
+    <liverywing>
+      <file type="string">n301dp</file>
+      <index type="int">0</index>
+    </liverywing>
+
+    <c172p>
+      <immat type="bool">false</immat>
+      <fairing1 type="bool">true</fairing1>
+      <fairing2 type="bool">false</fairing2>
+      <fairing3 type="bool">false</fairing3>
+    </c172p>
+
+    <hide-yoke type="bool">false</hide-yoke>
+  </model>
+
+  <startup>
+    <splash-texture>Aircraft/c172p/splash.png</splash-texture>
+  </startup>
+
+  <!-- hide the 2D panel -->
+ 
+  <panel>
+   <visibility type="bool" archive="y">false</visibility>
+  </panel>
+
+  <!-- position the pilot viewpoint and angle -->
+ 
+  <view>
+   <internal type="bool" archive="y">true</internal>
+   <config>
+     <x-offset-m archive="y" type="double">-0.21</x-offset-m>
+     <y-offset-m archive="y" type="double">0.235</y-offset-m>
+     <z-offset-m archive="y" type="double">0.36</z-offset-m>
+     <pitch-offset-deg type="double">-12</pitch-offset-deg>
+   </config>
+  </view>
+
+  <systems>
+    <autopilot>
+      <path>Aircraft/c172p/Systems/KAP140.xml</path>
+    </autopilot>
+    <property-rule n="100">
+      <name>FiltersOnly</name>
+      <path>Aircraft/c172p/Systems/NAVandGSfilters.xml</path>
+    </property-rule>
+    <electrical>
+      <!-- null electrical system path here so we can use a nasal based -->
+      <!-- model defined later in the nasal section of this file. -->
+      <path></path>
+    </electrical>
+  </systems>
+
+  <sound>
+   <path archive="y">Aircraft/c172p/c172-sound.xml</path>
+  </sound>
+
+  <help include="c172-help.xml"/>
+
+  <tutorials include="Tutorials/c172-tutorials.xml"/>
+
+  <dimensions>
+    <radius-m type="double">5</radius-m>
+  </dimensions>
+  <aircraft-class type="string">ga</aircraft-class>
+  <aircraft-operator type="string">NONE</aircraft-operator>
+
+  <multiplay>
+      <chat_display>1</chat_display>
+      <generic>
+        <float n="0" alias="/sim/model/door-positions/rightDoor/position-norm"/>
+        <float n="1" alias="/sim/model/door-positions/leftDoor/position-norm"/>
+        <float n="2" alias="/sim/model/door-positions/baggageDoor/position-norm"/>
+        <int type="int">0</int>
+        <int type="int">0</int>
+        <int type="int">0</int>
+        <int type="int">0</int>
+        <int type="int">0</int>
+        <int type="int">0</int>
+      </generic>
+  </multiplay>
+
+  <flight-recorder>
+    <replay-config type="int">0</replay-config>
+    <config n="0" include="/Aircraft/Generic/flightrecorder/generic-piston-propeller-1.xml">
+      <name type="string">C172p Flight Recorder</name>
+    </config>
+  </flight-recorder>
+
+  <menubar include="Dialogs/c172p-menu.xml"/>
+  <instrumentation n="0">
+    <path>Aircraft/c172p/Systems/instrumentation.xml</path>
+  </instrumentation>
+ </sim>
+
+ <!-- trim for level cruise -->
+
+ <controls>
+  <flight>
+   <aileron-trim type="double">0.027</aileron-trim>
+   <rudder-trim type="double">0.0</rudder-trim>
+  </flight>
+  <engines>
+   <engine n="0">
+    <magnetos type="int">3</magnetos>
+    <master-bat type="bool">true</master-bat>
+    <master-alt type="bool">true</master-alt>
+   </engine>
+  </engines>
+  <lighting>
+   <landing-lights type="bool">false</landing-lights>
+   <taxi-light type="bool">false</taxi-light>
+   <strobe type="bool">false</strobe>
+   <beacon type="bool">false</beacon>
+   <nav-lights type="bool">false</nav-lights>
+  </lighting>
+  <switches>
+   <master-avionics type="bool">true</master-avionics>
+   <starter type="bool">false</starter>
+  </switches>
+  <engines>
+    <engine>
+      <master-bat type="bool">true</master-bat>
+      <master-alt type="bool">true</master-alt>
+   </engine>
+  </engines>
+ </controls>
+
+ <autopilot>
+  <KAP140>
+   <settings>
+    <auto-pitch-trim type="bool">true</auto-pitch-trim>
+   </settings>
+  </KAP140>
+ </autopilot>
+
+ <consumables>
+  <fuel>
+   <tank n="0">
+    <level-gal_us type="double">20</level-gal_us>
+    <selected type="bool">true</selected>
+   </tank>
+   <tank n="1">
+    <level-gal_us type="double">20</level-gal_us>
+    <selected type="bool">true</selected>
+   </tank>
+  </fuel>
+ </consumables>
+
+ <instrumentation>
+  <kma20 include="Aircraft/Instruments-3d/kma20/kma20init.xml"/>
+  <attitude-indicator>
+   <config>
+    <tumble-flag archive="y" type="bool">true</tumble-flag>
+   </config>
+  </attitude-indicator>
+  <encoder>
+   <serviceable type="bool">true</serviceable>
+  </encoder>
+  <adf n="0">
+    <ident-audible type="bool">false</ident-audible>
+    <volume type="double">0.7</volume>
+  </adf>
+  <nav n="0">
+    <volume type="double">0.7</volume>
+  </nav>
+  <nav n="1">
+    <volume type="double">0.7</volume>
+  </nav>
+ </instrumentation>
+
+ <engines>
+  <engine>
+     <rpm type="double">0</rpm>
+     <magnetos type="int">0</magnetos>
+     <mixture type="double">0</mixture>
+     <running type="bool">false</running>
+  </engine>
+ </engines>
+
+ <nasal>
+ 
+    <c172p>
+      <file>Aircraft/c172p/Nasal/liveries.nas</file>
+      <file>Aircraft/c172p/Nasal/immat.nas</file>
+      <file>Aircraft/c172p/Nasal/doors.nas</file>
+      <file>Aircraft/c172p/Nasal/light.nas</file>
+      <file>Aircraft/c172p/Nasal/tanks.nas</file>
+      <file>Aircraft/c172p/Nasal/kma20.nas</file>
+      <file>Aircraft/c172p/Nasal/ki266.nas</file>
+      <script><![CDATA[
+        ki266.new(0);
+        aircraft.data.add( "engines/engine[0]/egt-bug-norm" );
+      ]]></script>
+    </c172p>
+
+  <electrical>
+   <file>Aircraft/c172p/Nasal/c172-electrical.nas</file>
+  </electrical>
+  <kap140>
+   <file>Aircraft/Generic/kap140.nas</file>
+   <!-- We can set some variables that might be
+        aircraft specific. We must do it after the file
+        to override the ones that are in the .nas file.-->
+   <script><![CDATA[
+                    headingNeedleDeflection = "/instrumentation/nav/heading-needle-deflection";
+                    gsNeedleDeflection = "/instrumentation/nav/gs-needle-deflection-norm";
+                    staticPressure = "systems/static/pressure-inhg";
+    ]]>
+   </script>
+  </kap140>
+  <kr87>
+            <file>Aircraft/c172p/Nasal/kr87.nas</file>
+        </kr87>
+  <canvas_demo>
+    <file>Aircraft/Instruments-3d/canvas-test/canvas-test.nas</file>
+  </canvas_demo>
+ </nasal>
+ <payload>
+  <weight>
+   <name type="string">Pilot</name>
+   <weight-lb alias="/fdm/jsbsim/inertia/pointmass-weight-lbs[0]"/>
+   <min-lb type="double">0.0</min-lb>
+   <max-lb type="double">300.0</max-lb>
+  </weight>
+  <weight>
+   <name type="string">Co-Pilot</name>
+   <weight-lb alias="/fdm/jsbsim/inertia/pointmass-weight-lbs[1]"/>
+   <min-lb type="double">0.0</min-lb>
+   <max-lb type="double">300.0</max-lb>
+  </weight>
+  <weight>
+   <name type="string">Left Passenger</name>
+   <weight-lb alias="/fdm/jsbsim/inertia/pointmass-weight-lbs[2]"/>
+   <min-lb type="double">0.0</min-lb>
+   <max-lb type="double">300.0</max-lb>
+  </weight>
+  <weight>
+   <name type="string">Right Passenger</name>
+   <weight-lb alias="/fdm/jsbsim/inertia/pointmass-weight-lbs[3]"/>
+   <min-lb type="double">0.0</min-lb>
+   <max-lb type="double">300.0</max-lb>
+  </weight>
+  <weight>
+   <name type="string">Baggage</name>
+   <weight-lb alias="/fdm/jsbsim/inertia/pointmass-weight-lbs[4]"/>
+   <min-lb type="double">0.0</min-lb>
+   <max-lb type="double">150.0</max-lb> <!-- WARNING: Max baggage "by the book" is 120lbs or less! -->
+  </weight>
+ </payload>
+ <limits>
+  <mass-and-balance>
+   <maximum-ramp-mass-lbs>2407</maximum-ramp-mass-lbs>
+   <maximum-takeoff-mass-lbs>2400</maximum-takeoff-mass-lbs>
+   <maximum-landing-mass-lbs>2400</maximum-landing-mass-lbs>
+  </mass-and-balance>
+ </limits>
+
+ <input>
+  <keyboard>
+   <key n="76">
+    <name>L</name>
+    <desc>Decrease Panel lighting</desc>
+    <repeatable type="bool">true</repeatable>
+    <binding>
+     <command>property-adjust</command>
+     <property>controls/lighting/instruments-norm</property>
+     <step>-0.1</step>
+     <min>0</min>
+     <max>1.0</max>
+     <wrap>0</wrap>
+    </binding>
+   </key>
+   <key n="108">
+    <name>l</name>
+    <desc>Increase Panel lighting</desc>
+    <repeatable type="bool">true</repeatable>
+    <binding>
+     <command>property-adjust</command>
+     <property>controls/lighting/instruments-norm</property>
+     <step>0.1</step>
+     <min>0</min>
+     <max>1.0</max>
+     <wrap>0</wrap>
+    </binding>
+   </key>
+   <key n="115">
+   <name>s</name>
+   <desc>Toggle Starter Switch</desc>
+   <binding>
+    <command>property-assign</command>
+    <property>/controls/switches/starter</property>
+    <value >1</value>
+   </binding>
+   <mod-up>
+    <binding>
+     <command>property-assign</command>
+     <property>/controls/switches/starter</property>
+     <value>0</value>
+    </binding>
+   </mod-up>
+  </key>
+  </keyboard> 
+ </input>
+
+</PropertyList>
diff --git a/Docs/README.commands b/Docs/README.commands
index 991c54e9a..aade6f086 100644
--- a/Docs/README.commands
+++ b/Docs/README.commands
@@ -180,7 +180,9 @@ property-interpolate - assign a value to a property, interpolated
   value:       the new value for the property; or
   property[1]: the name of the property holding the new value.
   time:        the time in seconds it takes for the transition from the
-               old value to the new value of property[0]
+               old value to the new value of property[0]; or
+  rate:        the ammount of change per second the value of property[0] changes
+               to transition to the new value
 
 property-adjust - adjust the value of a property
   property: the name of the property to increment or decrement
diff --git a/Materials/default/materials.xml b/Materials/default/materials.xml
index 086a92c5c..c9e0aed15 100644
--- a/Materials/default/materials.xml
+++ b/Materials/default/materials.xml
@@ -1042,7 +1042,6 @@
    </equals>
   </condition>
   <name>Marsh</name>
-  <name>Littoral</name>
   <name>FloodLand</name>
   <name>SaltMarsh</name>
   <name>HerbWetlandCover</name>
@@ -1060,6 +1059,25 @@
   <load-resistance>1e30</load-resistance>
 </material>
 
+<material>
+  <condition>
+   <equals>
+    <property>sim/startup/season</property>
+    <value>summer</value>
+   </equals>
+  </condition>
+  <name>Littoral</name>
+  <texture>Terrain/tidal.png</texture>
+  <xsize>2000</xsize>
+  <ysize>2000</ysize>
+  <solid>1</solid>
+  <light-coverage>40000000.0</light-coverage>
+  <friction-factor>0.8</friction-factor>
+  <rolling-friction>0.3</rolling-friction>
+  <bumpiness>0.2</bumpiness>
+  <load-resistance>1e30</load-resistance>
+</material>
+
 <material>
   <condition>
    <equals>
@@ -1815,7 +1833,6 @@
    </equals>
   </condition>
   <name>Marsh</name>
-  <name>Littoral</name>
   <name>FloodLand</name>
   <name>SaltMarsh</name>
   <name>HerbWetlandCover</name>
@@ -1833,6 +1850,25 @@
   <load-resistance>1e30</load-resistance>
 </material>
 
+<material>
+  <condition>
+   <equals>
+    <property>sim/startup/season</property>
+    <value>winter</value>
+   </equals>
+  </condition>
+  <name>Littoral</name>
+  <texture>Terrain/tidal.png</texture>
+  <xsize>2000</xsize>
+  <ysize>2000</ysize>
+  <solid>1</solid>
+  <light-coverage>40000000.0</light-coverage>
+  <friction-factor>0.8</friction-factor>
+  <rolling-friction>0.3</rolling-friction>
+  <bumpiness>0.2</bumpiness>
+  <load-resistance>1e30</load-resistance>
+</material>
+
 <material>
   <condition>
    <equals>
diff --git a/Materials/regions/materials.xml b/Materials/regions/materials.xml
index 31c12bc2a..1ca1de2eb 100644
--- a/Materials/regions/materials.xml
+++ b/Materials/regions/materials.xml
@@ -1144,7 +1144,6 @@
 
 <material include="Materials/regions/european.xml">
   <name>Marsh</name>
-  <name>Littoral</name>
   <name>FloodLand</name>
   <name>SaltMarsh</name>
   <name>HerbWetlandCover</name>
@@ -1162,6 +1161,19 @@
   <load-resistance>1e30</load-resistance>
 </material>
 
+<material include="Materials/regions/european.xml">
+  <name>Littoral</name>
+  <texture>Terrain/tidal.png</texture>
+  <xsize>2000</xsize>
+  <ysize>2000</ysize>
+  <solid>1</solid>
+  <light-coverage>40000000.0</light-coverage>
+  <friction-factor>0.8</friction-factor>
+  <rolling-friction>0.3</rolling-friction>
+  <bumpiness>0.2</bumpiness>
+  <load-resistance>1e30</load-resistance>
+</material>
+
 <material include="Materials/regions/european.xml">
   <effect>Effects/crop</effect>
   <name>MixedCropPastureCover</name>
@@ -1728,7 +1740,6 @@
    </equals>
   </condition>
   <name>Marsh</name>
-  <name>Littoral</name>
   <name>FloodLand</name>
   <name>SaltMarsh</name>
   <name>HerbWetlandCover</name>
@@ -1746,6 +1757,25 @@
   <load-resistance>1e30</load-resistance>
 </material>
 
+<material>
+  <condition>
+   <equals>
+    <property>sim/startup/season</property>
+    <value>summer</value>
+   </equals>
+  </condition>
+  <name>Littoral</name>
+  <texture>Terrain/tidal.png</texture>
+  <xsize>2000</xsize>
+  <ysize>2000</ysize>
+  <solid>1</solid>
+  <light-coverage>40000000.0</light-coverage>
+  <friction-factor>0.8</friction-factor>
+  <rolling-friction>0.3</rolling-friction>
+  <bumpiness>0.2</bumpiness>
+  <load-resistance>1e30</load-resistance>
+</material>
+
 <material>
   <condition>
    <equals>
@@ -2522,7 +2552,6 @@
    </equals>
   </condition>
   <name>Marsh</name>
-  <name>Littoral</name>
   <name>FloodLand</name>
   <name>SaltMarsh</name>
   <name>HerbWetlandCover</name>
@@ -2540,6 +2569,25 @@
   <load-resistance>1e30</load-resistance>
 </material>
 
+<material>
+  <condition>
+   <equals>
+    <property>sim/startup/season</property>
+    <value>winter</value>
+   </equals>
+  </condition>
+  <name>Littoral</name>
+  <texture>Terrain/tidal.png</texture>
+  <xsize>2000</xsize>
+  <ysize>2000</ysize>
+  <solid>1</solid>
+  <light-coverage>40000000.0</light-coverage>
+  <friction-factor>0.8</friction-factor>
+  <rolling-friction>0.3</rolling-friction>
+  <bumpiness>0.2</bumpiness>
+  <load-resistance>1e30</load-resistance>
+</material>
+
 <material>
   <condition>
    <equals>
diff --git a/Nasal/canvas/api.nas b/Nasal/canvas/api.nas
index a6f28f5ae..c6ae4d55e 100644
--- a/Nasal/canvas/api.nas
+++ b/Nasal/canvas/api.nas
@@ -575,7 +575,7 @@ var Path = {
     if( size(coords) != num_coords )
       debug.warn
       (
-        "Invalid number of arguments (expected " ~ (num_coords + 1) ~ ")"
+        "Invalid number of arguments (expected " ~ num_coords ~ ")"
       );
     else
     {
@@ -608,8 +608,8 @@ var Path = {
   quadTo: func me.addSegment(me.VG_SQUAD_TO_ABS, arg),
   quad:   func me.addSegment(me.VG_SQUAD_TO_REL, arg),
   # Add a smooth cubic Bézier curve
-  cubicTo: func me.addSegment(me.VG_SCUBIC_TO_ABS, arg),
-  cubic:   func me.addSegment(me.VG_SCUBIC_TO_REL, arg),
+  scubicTo: func me.addSegment(me.VG_SCUBIC_TO_ABS, arg),
+  scubic:   func me.addSegment(me.VG_SCUBIC_TO_REL, arg),
   # Draw an elliptical arc (shorter counter-clockwise arc)
   arcSmallCCWTo: func me.addSegment(me.VG_SCCWARC_TO_ABS, arg),
   arcSmallCCW:   func me.addSegment(me.VG_SCCWARC_TO_REL, arg),