Resolved: #27, #26, #23, #22, #13, #19