mitch's recent bug fixes