closes #1429, closes #1472, closes #1358

Done