Some fixes, more tests. Readme to be done