Bugfixes. It works!