Some bugfixes, many left.