Fix structs, add more tests.
Update readme