closes #1375 closes #1426 closes #1428 closes #1425

Done