cleanups. Merged credits patch from Ricardo and improved it.