More fixes, and still many more bugs...