fixing bugs starting over