Cleanup and first changes, including README