I want it that way

(also, bugfixes)