closes #279 (closed) closes #284 (closed) closes #231 (closed) (did not want to do a separate MR for this one)