Finished fixing what I effed during git merges.