fixed some broken stuff