Added Cor Class, Minor fixes