fix leftovers
variables naming fixed
putting them all together