Stuff that needed to be changed is described in a checkbox in the issue desc: #568 (closed)
Closes #568 (closed)