removed jwi dependency
fixed some issues
fix