edited TODO
fixed offX and offY bugs