many fixes, much new text