Small changes to variables

Fixed minor conflicts and definition problems