+ fixing bugs