fixing bugs, updating fixtures