Make File cleanup / Added Calc3p / fixed comments issue