More, more and more bugs fixed