Finish rest of classes, some cosmetic fixing