Close issue #1. Close issue #3. Close issue #5.