more fixes
fix var