fixed messed up commits. I hate you git