closes #1429, closes #1472, closes #1358

Wanna pair on it?  I would like to take care of this in this PR