Closes #1295. Closes #1292. Closes #1168