Issue 1 fixed.
Working on issue 2.