nearly all whoops found

cut and paste teaches me nothing...