Little improvements and progression on some classes. Not a big commit.