final bug fixes (one hopes)