all sorts of stuff I should've committed more than once