Some further /class/ improvements.