Fixed some stuff and more stuff