Added credits fixes and additional credit for Jeremy Natividad