finalize first good version before we screw up everything by a rewrite O:-)