Updated stuff, added some joint things