A few things I've added