Resolved issues 76,87. Other minor changes.