fix class member inheritance, and touch ups