Cleaned up stuff and added totals for leader