Fixed some variables to display properly