remove intellij warnings and fix typos
Merge branch 'jl'