further cleanups, initialization fixups