adjust to variables and various comments