Issue #667 solved. Issues #665 and #666 attempted.