jQuery usage removal

- jquery usage removal
- minor fixes, adjustments