Big fixes of messed up commits/merges/rebases