changed inheritance order / other small changes