fixing some vars