switching variables and fixing console logs

commit 2