more inheritance prep and fixes