forgot to change some files, finished changing variables and added some comments