additional broken stuff fixed

I should probably compile before commiting next time…