fixes
minor jwt fix and cleanup
fix