Fixing bugs and updating readme.