Eluna Fix crash, add more security and fix function arguments