Fixed Comp and a few other small bugs