varies other changes

seriously I haven’t been working on this for months…