more fixes, plus a big problem found