add Modifier class. + other small changes in other classes