more var names to fix