Fixes, tests, readme