fixes. fixes everywhere.