Fixing bugs, updating introduction