Cleaned more API, and README.md changes