A bunch of TenderSmash improvements