Issues #65 and #71 solved. Also almost finished Issue #70