-More assistant fixes
-Lang fixes