Updated several things, still wip