Fuckity bye. Fixes #336. Fixes #342. Fixes #338. Fixes #324. Fixes #346.