Closes #1040 (closed), #1029 (closed), #1028 (closed), #1026 (closed), #1025 (closed), #1018 (closed)