Cleanup and fix info.