Fixing bugs, updated README