Fixed all the things alekos told me to fix.