Simplify API, add related bugs, update README