Fix bugs; improve code
Update version