Beam core jai

minor improvements