fixed xform issue
refactor, cleaning queue form