Fixing bugs, working