fix inheritance and more major work