More free var work
Fix more cheats