Resolved issues 62,63. Minor changes.