More misc. stuff I should've committed earlier.