fixing bugs, grrr