diff --git a/demos/fkine.m b/demos/fkine.m
index 0db5ba3d..fdf341b1 100644
--- a/demos/fkine.m
+++ b/demos/fkine.m
@@ -74,11 +74,11 @@
 xlabel('Time (s)');
 ylabel('X (m)')
 subplot(3,1,2)
-plot(t, p(:,1))
+plot(t, p(:,2))
 xlabel('Time (s)');
 ylabel('Y (m)')
 subplot(3,1,3)
-plot(t, p(:,1))
+plot(t, p(:,3))
 xlabel('Time (s)');
 ylabel('Z (m)')
 
diff --git a/models/mdl_puma560.m b/models/mdl_puma560.m
index 8f6b99e7..242ee4c6 100644
--- a/models/mdl_puma560.m
+++ b/models/mdl_puma560.m
@@ -7,7 +7,7 @@
 % Also define the workspace vectors:
 %   qz         zero joint angle configuration
 %   qr         vertical 'READY' configuration
-%   qstretch   arm is stretched out in the X direction
+%   qs         arm is stretched out in the X direction
 %   qn         arm is at a nominal non-singular configuration
 %
 % Notes::
@@ -146,7 +146,7 @@
 qz = [0 0 0 0 0 0]; % zero angles, L shaped pose
 qr = [0 pi/2 -pi/2 0 0 0]; % ready pose, arm up
 qs = [0 0 -pi/2 0 0 0];
-qn=[0 pi/4 pi 0 pi/4  0];
+qn = [0 pi/4 pi 0 pi/4  0];
 
 p560 = SerialLink(L, 'name', 'Puma 560', ...
     'configs', {'qz', qz, 'qr', qr, 'qs', qs, 'qn', qn}, ...