Some more changes to init / versino