Fix some bugs and clarify README