random changes that aren't ready for merge yet