more updates to the inheritance analysis and various fixes and changes