Resolved issues 86,89,90. Other minor changes.