Redone some classes, fixed XML