some bugfixes, but still major issues