trying to fix some broken stuff up