Structs (and several bug fixes) !