Fix #1
Fix #3
Fix #4