Fixes, cleanup, readme