a few quality of life fixes