Resolved #1
Resolved #2
Resolved #3