tons of fixes, too many to list