Re-doing credits and other code updates