Credit changes, cleanup, minor fixes