Resolved 2 issues. To be continued tomorrow.