Fixed broken stuff I think