Fixed some version garbage

Should be almost ready.