Major bugfixes. How did it work before? O_o