knocked off a few old todos