merge
copy, bug fixes, league.