more fixes, interrupted.