variable fixes;other fixes;