bugfixes. Done