Commented and fixed loops where I mistakenly hard-coded