Edit issue #4

Close issue.
Edit issue #8

Close issue.
Create issue #9