tons of bugfixes