Various changes

I probably should've opened multiple requests for this...