Make subclassing easer + few fixes