jl - some more general tweaks
jl - some more general tweaks