fix the fixes from Michael theory comments.