Fixed some stuff and added better crediting