adds somethings, I forget what cuz I waited to long between commits
fixes merge conflicts