more inheritant fixes and suggestions from nard