Improve Readme and src
Fix Readme