Fixed most parts you said to fix.