Updates and stuff

Conflicts fixed