Many, many bugfixes, a lot!