jtap + fixes