Been awhile, I forget most of these that aren't plain bug fixes