fixed tx-specs
Merge branch 'working' into ejb-working