Fixed some stuff and added some stuff