Fixed variables and added back in comments, also added in common variables to variables-dark