Merged in all changes from Jeff's site, plus removed paths from data files