fixed broken stuff