bug fixes that I should have done last year

arg