More fixes, still needs debugging.