fixed some variables for better overview