Update readme
Update comments
Fix parameter
Minor reorganization