Updated some stuff and added some stuff :P