fixing bugs wee