fixing some broken stuff